diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java
index 21719df20b..5e84d5e23a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java
@@ -13,6 +13,7 @@ import org.thoughtcrime.securesms.jobmanager.persistence.DependencySpec;
 import org.thoughtcrime.securesms.jobmanager.persistence.FullSpec;
 import org.thoughtcrime.securesms.jobmanager.persistence.JobSpec;
 
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -22,6 +23,8 @@ public class JobDatabase extends Database {
                                                              Constraints.CREATE_TABLE,
                                                              Dependencies.CREATE_TABLE };
 
+  private static final ArrayList<String> runningJobs = new ArrayList<>();
+
   public static final class Jobs {
     public  static final String TABLE_NAME            = "job_spec";
     private static final String ID                    = "_id";
@@ -113,18 +116,17 @@ public class JobDatabase extends Database {
   }
 
   public synchronized void updateJobRunningState(@NonNull String id, boolean isRunning) {
-    ContentValues contentValues = new ContentValues();
-    contentValues.put(Jobs.IS_RUNNING, isRunning ? 1 : 0);
-
-    String   query = Jobs.JOB_SPEC_ID + " = ?";
-    String[] args  = new String[]{ id };
-
-    databaseHelper.getWritableDatabase().update(Jobs.TABLE_NAME, contentValues, query, args);
+    if (!isRunning) {
+      JobDatabase.runningJobs.remove(id);
+    } else if (!JobDatabase.runningJobs.contains(id)) {
+      JobDatabase.runningJobs.add(id);
+    }
   }
 
   public synchronized void updateJobAfterRetry(@NonNull String id, boolean isRunning, int runAttempt, long nextRunAttemptTime) {
+    updateJobRunningState(id, isRunning);
+
     ContentValues contentValues = new ContentValues();
-    contentValues.put(Jobs.IS_RUNNING, isRunning ? 1 : 0);
     contentValues.put(Jobs.RUN_ATTEMPT, runAttempt);
     contentValues.put(Jobs.NEXT_RUN_ATTEMPT_TIME, nextRunAttemptTime);
 
@@ -135,13 +137,7 @@ public class JobDatabase extends Database {
   }
 
   public synchronized void updateAllJobsToBePending() {
-    ContentValues contentValues = new ContentValues();
-    contentValues.put(Jobs.IS_RUNNING, 0);
-
-    String   query = Jobs.IS_RUNNING + " = ?";
-    String[] args = new String[] { "1" };
-
-    databaseHelper.getWritableDatabase().update(Jobs.TABLE_NAME, contentValues, query, args);
+    JobDatabase.runningJobs.clear();
   }
 
   public synchronized void deleteJobs(@NonNull List<String> jobIds) {
@@ -202,7 +198,7 @@ public class JobDatabase extends Database {
     contentValues.put(Jobs.MAX_INSTANCES, job.getMaxInstances());
     contentValues.put(Jobs.LIFESPAN, job.getLifespan());
     contentValues.put(Jobs.SERIALIZED_DATA, job.getSerializedData());
-    contentValues.put(Jobs.IS_RUNNING, job.isRunning() ? 1 : 0);
+    updateJobRunningState(job.getId(), job.isRunning());
 
     db.insertWithOnConflict(Jobs.TABLE_NAME, null, contentValues, SQLiteDatabase.CONFLICT_IGNORE);
   }
@@ -226,7 +222,8 @@ public class JobDatabase extends Database {
   }
 
   private @NonNull JobSpec jobSpecFromCursor(@NonNull Cursor cursor) {
-    return new JobSpec(cursor.getString(cursor.getColumnIndexOrThrow(Jobs.JOB_SPEC_ID)),
+    String jobId = cursor.getString(cursor.getColumnIndexOrThrow(Jobs.JOB_SPEC_ID));
+    return new JobSpec(jobId,
                        cursor.getString(cursor.getColumnIndexOrThrow(Jobs.FACTORY_KEY)),
                        cursor.getString(cursor.getColumnIndexOrThrow(Jobs.QUEUE_KEY)),
                        cursor.getLong(cursor.getColumnIndexOrThrow(Jobs.CREATE_TIME)),
@@ -237,7 +234,7 @@ public class JobDatabase extends Database {
                        cursor.getLong(cursor.getColumnIndexOrThrow(Jobs.LIFESPAN)),
                        cursor.getInt(cursor.getColumnIndexOrThrow(Jobs.MAX_INSTANCES)),
                        cursor.getString(cursor.getColumnIndexOrThrow(Jobs.SERIALIZED_DATA)),
-                       cursor.getInt(cursor.getColumnIndexOrThrow(Jobs.IS_RUNNING)) == 1);
+                       JobDatabase.runningJobs.contains(jobId));
   }
 
   private @NonNull ConstraintSpec constraintSpecFromCursor(@NonNull Cursor cursor) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SessionJobDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/SessionJobDatabase.kt
index 66497d9da8..b081fb007e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SessionJobDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SessionJobDatabase.kt
@@ -46,7 +46,7 @@ class SessionJobDatabase(context: Context, helper: SQLCipherOpenHelper) : Databa
         databaseHelper.writableDatabase.delete(sessionJobTable, "${Companion.jobID} = ?", arrayOf( jobID ))
     }
 
-    fun getAllPendingJobs(type: String): Map<String, Job?> {
+    fun getAllJobs(type: String): Map<String, Job?> {
         val database = databaseHelper.readableDatabase
         return database.getAll(sessionJobTable, "$jobType = ?", arrayOf( type )) { cursor ->
             val jobID = cursor.getString(jobID)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
index 076fa57afc..0d7ea3352f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -211,7 +211,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
     }
 
     override fun getAllPendingJobs(type: String): Map<String, Job?> {
-        return DatabaseComponent.get(context).sessionJobDatabase().getAllPendingJobs(type)
+        return DatabaseComponent.get(context).sessionJobDatabase().getAllJobs(type)
     }
 
     override fun getAttachmentUploadJob(attachmentID: Long): AttachmentUploadJob? {
diff --git a/app/src/test/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java b/app/src/test/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java
index ee1f232b54..a6624189d1 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java
@@ -74,16 +74,6 @@ public class FastJobStorageTest {
     assertEquals(DataSet1.JOB_2, subject.getJobSpec(DataSet1.JOB_2.getId()));
   }
 
-  @Test
-  public void updateAllJobsToBePending_writesToDatabase() {
-    JobDatabase    database = noopDatabase();
-    FastJobStorage subject  = new FastJobStorage(database);
-
-    subject.updateAllJobsToBePending();
-
-    verify(database).updateAllJobsToBePending();
-  }
-
   @Test
   public void updateAllJobsToBePending_allArePending() {
     FullSpec fullSpec1 = new FullSpec(new JobSpec("1", AvatarDownloadJob.KEY, null, 1, 1, 1, 1, 1, 1, 1, EMPTY_DATA, true),