diff --git a/ts/background.ts b/ts/background.ts
index ed179087b..526f0f642 100644
--- a/ts/background.ts
+++ b/ts/background.ts
@@ -31,12 +31,14 @@ export async function startApp(): Promise<void> {
   }
 
   window.textsecure.protobuf.onLoad(() => {
-    senderCertificateService.initialize({
-      WebAPI: window.WebAPI,
-      navigator,
-      onlineEventTarget: window,
-      SenderCertificate: window.textsecure.protobuf.SenderCertificate,
-      storage: window.storage,
+    window.storage.onready(() => {
+      senderCertificateService.initialize({
+        WebAPI: window.WebAPI,
+        navigator,
+        onlineEventTarget: window,
+        SenderCertificate: window.textsecure.protobuf.SenderCertificate,
+        storage: window.storage,
+      });
     });
   });