diff --git a/frontend/wave.ts b/frontend/wave.ts
index deca51ae7..4328c4fe2 100644
--- a/frontend/wave.ts
+++ b/frontend/wave.ts
@@ -109,21 +109,27 @@ async function reinitWave() {
 }
 
 function reloadAllWorkspaceTabs(ws: Workspace) {
-    if (ws == null || ws.tabids == null) {
+    if (ws == null || (!ws.tabids?.length && !ws.pinnedtabids?.length)) {
         return;
     }
-    ws.tabids.forEach((tabid) => {
+    ws?.tabids.forEach((tabid) => {
+        WOS.reloadWaveObject<Tab>(WOS.makeORef("tab", tabid));
+    });
+    ws?.pinnedtabids?.forEach((tabid) => {
         WOS.reloadWaveObject<Tab>(WOS.makeORef("tab", tabid));
     });
 }
 
 function loadAllWorkspaceTabs(ws: Workspace) {
-    if (ws == null || ws.tabids == null) {
+    if (ws == null || (!ws.tabids?.length && !ws.pinnedtabids?.length)) {
         return;
     }
     ws.tabids.forEach((tabid) => {
         WOS.getObjectValue<Tab>(WOS.makeORef("tab", tabid));
     });
+    ws.pinnedtabids.forEach((tabid) => {
+        WOS.getObjectValue<Tab>(WOS.makeORef("tab", tabid));
+    });
 }
 
 async function initWave(initOpts: WaveInitOpts) {