diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css
index 109e43ec7..948be2501 100644
--- a/src/browser/base/content/zen-styles/zen-workspaces.css
+++ b/src/browser/base/content/zen-styles/zen-workspaces.css
@@ -437,7 +437,7 @@
   }
 }
 
-@media not (-moz-bool-pref: 'zen.workspaces.show-workspace-indicator') {
+@media not (-moz-bool-pref: 'zen.workspaces.show-workspace-indicator') or (not (-moz-bool-pref: 'zen.workspaces.enabled')) {
   #zen-current-workspace-indicator {
     display: none !important;
   }
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 382c4ecbf..e276c49c1 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1465,6 +1465,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     const isEssential = tab.getAttribute("zen-essential") === "true";
     if (!isEssential) {
       const activeWorkspace = await parent.ZenWorkspaces.getActiveWorkspace();
+      if (!activeWorkspace) {
+        return;
+      }
 
       // Only update last selected tab for non-essential tabs in their workspace
       if (!isEssential && workspaceID === activeWorkspace.uuid) {