diff --git a/src/ZenPinnedTabManager.mjs b/src/ZenPinnedTabManager.mjs
index 3b5c5cf..7a424d4 100644
--- a/src/ZenPinnedTabManager.mjs
+++ b/src/ZenPinnedTabManager.mjs
@@ -41,8 +41,7 @@
     async init() {
       this.observer = new ZenPinnedTabsObserver();
       await ZenPinnedTabsStorage.init();
-      // TODO: Figure out if this is even needed - for now it's commented out
-      // await SessionStore.promiseInitialized;
+      await SessionStore.promiseInitialized;
       await  this._refreshPinnedTabs();
       this._initClosePinnedTabShortcut();
       this._insertItemsIntoTabContextMenu();
diff --git a/src/ZenPinnedTabsStorage.mjs b/src/ZenPinnedTabsStorage.mjs
index 09043bf..8c84312 100644
--- a/src/ZenPinnedTabsStorage.mjs
+++ b/src/ZenPinnedTabsStorage.mjs
@@ -1,7 +1,11 @@
 var ZenPinnedTabsStorage = {
   async init() {
     console.log('ZenPinnedTabsStorage: Initializing...');
-    await this._ensureTable();
+    try {
+      await this._ensureTable();
+    } catch (e) {
+      console.warn('ZenPinnedTabsStorage: Failed to initialize', e);
+    }
   },
 
   async _ensureTable() {