diff --git a/src/components/ActiveWorkspace/ActiveWorkspaceContext.tsx b/src/components/ActiveWorkspace/ActiveWorkspaceContext.tsx
index 408c8beb046a..466f0f492c8e 100644
--- a/src/components/ActiveWorkspace/ActiveWorkspaceContext.tsx
+++ b/src/components/ActiveWorkspace/ActiveWorkspaceContext.tsx
@@ -5,7 +5,7 @@ type ActiveWorkspaceContextType = {
     setActiveWorkspaceID: (activeWorkspaceID?: string) => void;
 };
 
-const ActiveWorkspaceContext = createContext<ActiveWorkspaceContextType | null>(null);
+const ActiveWorkspaceContext = createContext<ActiveWorkspaceContextType>({activeWorkspaceID: undefined, setActiveWorkspaceID: () => undefined});
 
 export default ActiveWorkspaceContext;
 export {type ActiveWorkspaceContextType};