diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
index 17a665053a..4954dad71c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -254,10 +254,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
       AppDependencies.getShakeToReport().enable();
       checkBuildExpiration();
       MemoryTracker.start();
-
-      if (RemoteConfig.messageBackups()) {
-        AppDependencies.getJobManager().add(BackupSubscriptionCheckJob.create());
-      }
+      BackupSubscriptionCheckJob.enqueueIfAble();
 
       long lastForegroundTime = SignalStore.misc().getLastForegroundTime();
       long currentTime        = System.currentTimeMillis();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJob.kt
index a80a2ed0b7..ef96c1235b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupSubscriptionCheckJob.kt
@@ -5,6 +5,7 @@
 
 package org.thoughtcrime.securesms.jobs
 
+import androidx.annotation.VisibleForTesting
 import org.signal.core.util.billing.BillingPurchaseResult
 import org.signal.core.util.logging.Log
 import org.signal.donations.InAppPaymentType
@@ -29,7 +30,7 @@ class BackupSubscriptionCheckJob private constructor(parameters: Parameters) : C
 
     const val KEY = "BackupSubscriptionCheckJob"
 
-    @JvmStatic
+    @VisibleForTesting
     fun create(): BackupSubscriptionCheckJob {
       return BackupSubscriptionCheckJob(
         Parameters.Builder()
@@ -40,6 +41,17 @@ class BackupSubscriptionCheckJob private constructor(parameters: Parameters) : C
           .build()
       )
     }
+
+    @JvmStatic
+    fun enqueueIfAble() {
+      if (!RemoteConfig.messageBackups) {
+        return
+      }
+
+      val job = create()
+
+      AppDependencies.jobManager.add(job)
+    }
   }
 
   override suspend fun doRun(): Result {