diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index b3624ed1e..4473d7656 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -409,6 +409,10 @@
         return;
       }
 
+      if (Services.startup.shuttingDown || window.skipNextCanClose) {
+        return;
+      }
+
       await ZenPinnedTabsStorage.removePin(tab.getAttribute('zen-pin-id'));
 
       if (!isClosing) {