diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ProfileUploadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ProfileUploadJob.java
index 001f16c0249..d531872c96b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ProfileUploadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ProfileUploadJob.java
@@ -26,13 +26,15 @@ public final class ProfileUploadJob extends BaseJob {
 
   public static final String KEY = "ProfileUploadJob";
 
+  public static final String QUEUE = "ProfileAlteration";
+
   private final Context                     context;
   private final SignalServiceAccountManager accountManager;
 
   public ProfileUploadJob() {
     this(new Job.Parameters.Builder()
                             .addConstraint(NetworkConstraint.KEY)
-                            .setQueue(KEY)
+                            .setQueue(QUEUE)
                             .setLifespan(Parameters.IMMORTAL)
                             .setMaxAttempts(Parameters.UNLIMITED)
                             .setMaxInstances(1)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java
index 4eac490ef7a..bc21f6625c9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java
@@ -43,7 +43,7 @@ public class RefreshOwnProfileJob extends BaseJob {
   public RefreshOwnProfileJob() {
     this(new Parameters.Builder()
                        .addConstraint(NetworkConstraint.KEY)
-                       .setQueue("RefreshOwnProfileJob")
+                       .setQueue(ProfileUploadJob.QUEUE)
                        .setMaxInstances(1)
                        .setMaxAttempts(10)
                        .build());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
index 39083a638d8..a7f9f9d9d41 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -131,10 +131,18 @@ public final class FeatureFlags {
    */
   private static final Map<String, OnFlagChange> FLAG_CHANGE_LISTENERS = new HashMap<String, OnFlagChange>() {{
     put(MESSAGE_REQUESTS,   (change) -> SignalStore.setMessageRequestEnableTime(change == Change.ENABLED ? System.currentTimeMillis() : 0));
-    put(VERSIONED_PROFILES, (change) -> ApplicationDependencies.getJobManager().add(new ProfileUploadJob()));
-    put(GROUPS_V2,          (change) -> ApplicationDependencies.getJobManager().startChain(new RefreshAttributesJob())
-                                                                               .then(new RefreshOwnProfileJob())
-                                                                               .enqueue());
+    put(VERSIONED_PROFILES, (change) -> {
+      if (change == Change.ENABLED) {
+        ApplicationDependencies.getJobManager().add(new ProfileUploadJob());
+      }
+    });
+    put(GROUPS_V2, (change) -> {
+      if (change == Change.ENABLED) {
+        ApplicationDependencies.getJobManager().startChain(new RefreshAttributesJob())
+                               .then(new RefreshOwnProfileJob())
+                               .enqueue();
+      }
+    });
   }};
 
   private static final Map<String, Object> REMOTE_VALUES = new TreeMap<>();