diff --git a/src/components/bar/modules/workspaces/workspaces.tsx b/src/components/bar/modules/workspaces/workspaces.tsx
index 39695817..a29b2009 100644
--- a/src/components/bar/modules/workspaces/workspaces.tsx
+++ b/src/components/bar/modules/workspaces/workspaces.tsx
@@ -145,7 +145,7 @@ export const WorkspaceModule = ({ monitor }: WorkspaceModuleProps): JSX.Element
                                 monitor,
                             )}
                             setup={(self) => {
-                                const currentWsClients = clients.filter((client) => client.workspace.id === wsId);
+                                const currentWsClients = clients.filter((client) => client?.workspace?.id === wsId);
                                 self.toggleClassName('occupied', currentWsClients.length > 0);
                             }}
                         />