diff --git a/SessionNotificationServiceExtension/NotificationServiceExtension.swift b/SessionNotificationServiceExtension/NotificationServiceExtension.swift
index 5705a4661..7cfeae747 100644
--- a/SessionNotificationServiceExtension/NotificationServiceExtension.swift
+++ b/SessionNotificationServiceExtension/NotificationServiceExtension.swift
@@ -25,6 +25,9 @@ public final class NotificationServiceExtension: UNNotificationServiceExtension
         self.contentHandler = contentHandler
         self.request = request
         
+        // Resume database
+        NotificationCenter.default.post(name: Database.resumeNotification, object: self)
+        
         guard let notificationContent = request.content.mutableCopy() as? UNMutableNotificationContent else {
             return self.completeSilenty()
         }
@@ -237,6 +240,10 @@ public final class NotificationServiceExtension: UNNotificationServiceExtension
     
     private func completeSilenty() {
         SNLog("Complete silenty")
+        
+        // Suspend the database
+        NotificationCenter.default.post(name: Database.suspendNotification, object: self)
+        
         self.contentHandler!(.init())
     }
     
@@ -298,11 +305,10 @@ public final class NotificationServiceExtension: UNNotificationServiceExtension
         SNLog("Add remote notification request")
     }
 
-    private func handleSuccess(for content: UNMutableNotificationContent) {
-        contentHandler!(content)
-    }
-
     private func handleFailure(for content: UNMutableNotificationContent) {
+        // Suspend the database
+        NotificationCenter.default.post(name: Database.suspendNotification, object: self)
+        
         content.body = "You've got a new message"
         content.title = "Session"
         let userInfo: [String:Any] = [ NotificationServiceExtension.isFromRemoteKey : true ]
diff --git a/SessionShareExtension/ThreadPickerVC.swift b/SessionShareExtension/ThreadPickerVC.swift
index 4d3352558..f1ea3813d 100644
--- a/SessionShareExtension/ThreadPickerVC.swift
+++ b/SessionShareExtension/ThreadPickerVC.swift
@@ -220,6 +220,8 @@ final class ThreadPickerVC: UIViewController, UITableViewDataSource, UITableView
         shareVC?.dismiss(animated: true, completion: nil)
         
         ModalActivityIndicatorViewController.present(fromViewController: shareVC!, canCancel: false, message: "vc_share_sending_message".localized()) { activityIndicator in
+            // Resume database
+            NotificationCenter.default.post(name: Database.resumeNotification, object: self)
             Storage.shared
                 .writeAsync { [weak self] db -> Promise<Void> in
                     guard let thread: SessionThread = try SessionThread.fetchOne(db, id: threadId) else {
@@ -271,10 +273,14 @@ final class ThreadPickerVC: UIViewController, UITableViewDataSource, UITableView
                     )
                 }
                 .done { [weak self] _ in
+                    // Suspend the database
+                    NotificationCenter.default.post(name: Database.suspendNotification, object: self)
                     activityIndicator.dismiss { }
                     self?.shareVC?.shareViewWasCompleted()
                 }
                 .catch { [weak self] error in
+                    // Suspend the database
+                    NotificationCenter.default.post(name: Database.suspendNotification, object: self)
                     activityIndicator.dismiss { }
                     self?.shareVC?.shareViewFailed(error: error)
                 }