diff --git a/pkgs/clan-app/ui/src/routes/Clan/Clan.tsx b/pkgs/clan-app/ui/src/routes/Clan/Clan.tsx
index ba8d4f6f5..8d9dd3ac0 100644
--- a/pkgs/clan-app/ui/src/routes/Clan/Clan.tsx
+++ b/pkgs/clan-app/ui/src/routes/Clan/Clan.tsx
@@ -37,6 +37,7 @@ import { Sidebar } from "@/src/components/Sidebar/Sidebar";
 import { UseQueryResult } from "@tanstack/solid-query";
 
 export const ClanContext = createContext<{
+  clanURI: string;
   machinesQuery: MachinesQueryResult;
   activeClanQuery: UseQueryResult<ClanDetailsWithURI>;
   otherClanQueries: UseQueryResult<ClanDetailsWithURI>[];
@@ -55,6 +56,7 @@ export const Clan: Component<RouteSectionProps> = (props) => {
   return (
     <ClanContext.Provider
       value={{
+        clanURI,
         machinesQuery,
         activeClanQuery,
         otherClanQueries,
@@ -118,14 +120,14 @@ const MockCreateMachine = (props: MockProps) => {
 };
 
 const ClanSceneController = (props: RouteSectionProps) => {
-  const clanURI = useClanURI();
-  const navigate = useNavigate();
-
   const ctx = useContext(ClanContext);
   if (!ctx) {
     throw new Error("ClanContext not found");
   }
 
+  const navigate = useNavigate();
+  const { clanURI } = ctx;
+
   const [dialogHandlers, setDialogHandlers] = createSignal<{
     resolve: ({ id }: { id: string }) => void;
     reject: (err: unknown) => void;
@@ -261,10 +263,7 @@ const ClanSceneController = (props: RouteSectionProps) => {
         isLoading={isLoading()}
         cubesQuery={ctx.machinesQuery}
         onCreate={onCreate}
-        sceneStore={() => {
-          const clanURI = useClanURI();
-          return store.sceneData?.[clanURI];
-        }}
+        sceneStore={() => store.sceneData?.[ctx.clanURI]}
         setMachinePos={(machineId: string, pos: [number, number]) => {
           console.log("calling setStore", machineId, pos);
           setStore(