diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m
index 2c31061d8..dd72453fe 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@@ -1613,10 +1613,10 @@ NS_ASSUME_NONNULL_BEGIN
 
     // Update thread preview in inbox
     [masterThread touchWithTransaction:transaction];
-
-    [SSKEnvironment.shared.notificationsManager notifyUserForIncomingMessage:incomingMessage
-                                                                    inThread:masterThread
-                                                                 transaction:transaction];
+    
+    if (CurrentAppContext().isMainAppAndActive) {
+        [SSKEnvironment.shared.notificationsManager notifyUserForIncomingMessage:incomingMessage inThread:masterThread transaction:transaction];
+    }
 
     dispatch_async(dispatch_get_main_queue(), ^{
         [self.typingIndicators didReceiveIncomingMessageInThread:masterThread
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SessionStore.m b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SessionStore.m
index a96461456..9dea9ebc8 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SessionStore.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+SessionStore.m
@@ -88,8 +88,6 @@ NSString *const kSessionStoreDBConnectionKey = @"kSessionStoreDBConnectionKey";
     OWSAssertDebug(contactIdentifier.length > 0);
     OWSAssertDebug(deviceId >= 0);
     OWSAssertDebug([protocolContext isKindOfClass:[YapDatabaseReadWriteTransaction class]]);
-    // FIXME: This needs a comment from Ryan explaining why it's necessary (it has to do with push notifications)
-    if (!CurrentAppContext().isMainApp) { return; }
 
     YapDatabaseReadWriteTransaction *transaction = protocolContext;