diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.kt
index 0bead56308..b3978ccf75 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.kt
@@ -23,9 +23,6 @@ import org.signal.core.util.update
 import org.signal.core.util.withinTransaction
 import org.thoughtcrime.securesms.crypto.DatabaseSecret
 import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider
-import org.thoughtcrime.securesms.database.SignalDatabase.Companion.hasTable
-import org.thoughtcrime.securesms.database.SignalDatabase.Companion.rawDatabase
-import org.thoughtcrime.securesms.database.SqlCipherLibraryLoader.load
 import org.thoughtcrime.securesms.jobmanager.persistence.ConstraintSpec
 import org.thoughtcrime.securesms.jobmanager.persistence.DependencySpec
 import org.thoughtcrime.securesms.jobmanager.persistence.FullSpec
@@ -123,19 +120,19 @@ class JobDatabase(
     db.execSQL(Constraints.CREATE_TABLE)
     db.execSQL(Dependencies.CREATE_TABLE)
 
-    if (hasTable("job_spec")) {
+    if (SignalDatabase.hasTable("job_spec")) {
       Log.i(TAG, "Found old job_spec table. Migrating data.")
-      migrateJobSpecsFromPreviousDatabase(rawDatabase, db)
+      migrateJobSpecsFromPreviousDatabase(SignalDatabase.rawDatabase, db)
     }
 
-    if (hasTable("constraint_spec")) {
+    if (SignalDatabase.hasTable("constraint_spec")) {
       Log.i(TAG, "Found old constraint_spec table. Migrating data.")
-      migrateConstraintSpecsFromPreviousDatabase(rawDatabase, db)
+      migrateConstraintSpecsFromPreviousDatabase(SignalDatabase.rawDatabase, db)
     }
 
-    if (hasTable("dependency_spec")) {
+    if (SignalDatabase.hasTable("dependency_spec")) {
       Log.i(TAG, "Found old dependency_spec table. Migrating data.")
-      migrateDependencySpecsFromPreviousDatabase(rawDatabase, db)
+      migrateDependencySpecsFromPreviousDatabase(SignalDatabase.rawDatabase, db)
     }
   }
 
@@ -405,9 +402,9 @@ class JobDatabase(
   }
 
   private fun dropTableIfPresent(table: String) {
-    if (hasTable(table)) {
+    if (SignalDatabase.hasTable(table)) {
       Log.i(TAG, "Dropping original $table table from the main database.")
-      rawDatabase.execSQL("DROP TABLE $table")
+      SignalDatabase.rawDatabase.execSQL("DROP TABLE $table")
     }
   }
 
@@ -425,7 +422,7 @@ class JobDatabase(
       if (instance == null) {
         synchronized(JobDatabase::class.java) {
           if (instance == null) {
-            load()
+            SqlCipherLibraryLoader.load()
             instance = JobDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context))
           }
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java
index 20c843051d..cd26387f7e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java
@@ -54,7 +54,7 @@ public class JobManager implements ConstraintObserver.Notifier {
   @GuardedBy("emptyQueueListeners")
   private final Set<EmptyQueueListener> emptyQueueListeners = new CopyOnWriteArraySet<>();
 
-  private volatile boolean initialized;
+  private volatile boolean initialized = false;
 
   public JobManager(@NonNull Application application, @NonNull Configuration configuration) {
     this.application   = application;
@@ -73,6 +73,7 @@ public class JobManager implements ConstraintObserver.Notifier {
 
     executor.execute(() -> {
       synchronized (this) {
+        Log.d(TAG, "Starting initialization: " + Thread.currentThread());
         JobStorage jobStorage = configuration.getJobStorage();
         jobStorage.init();
 
@@ -91,6 +92,10 @@ public class JobManager implements ConstraintObserver.Notifier {
 
         initialized = true;
         notifyAll();
+
+        jobController.wakeUp();
+
+        Log.d(TAG, "Initialized");
       }
     });
   }
@@ -343,6 +348,11 @@ public class JobManager implements ConstraintObserver.Notifier {
 
   @Override
   public void onConstraintMet(@NonNull String reason) {
+    if (!initialized) {
+      Log.d(TAG, "Ignoring early onConstraintMet(" + reason + ")");
+      return;
+    }
+
     Log.i(TAG, "onConstraintMet(" + reason + ")");
     wakeUp();
   }