diff --git a/src/components/three/gameplay/RepairGame.tsx b/src/components/three/gameplay/RepairGame.tsx
index 63dbd67..37b61f9 100644
--- a/src/components/three/gameplay/RepairGame.tsx
+++ b/src/components/three/gameplay/RepairGame.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { Suspense, useEffect, useState } from "react";
 import { ExplodableModel } from "@/components/three/models/ExplodableModel";
 import type { RepairCasePlaceholder } from "@/components/three/gameplay/RepairCaseModel";
 import { RepairCompletionStep } from "@/components/three/gameplay/RepairCompletionStep";
@@ -71,54 +71,56 @@ export function RepairGame({
 
   return (
     <group position={position} rotation={rotation} scale={parsedScale}>
-      {step === "waiting" ? (
-        <RepairInspectionObject
-          config={config}
-          worldPosition={position}
-          onInspect={() => setMissionStep(mission, "inspected")}
-        />
-      ) : null}
-      {step === "fragmented" ? (
-        <ExplodableModel modelPath={config.modelPath} split />
-      ) : null}
-      {step === "scanning" ? (
-        <RepairScanSequence
-          config={config}
-          onComplete={(brokenParts) => {
-            setScannedBrokenParts(brokenParts);
-            setMissionStep(mission, "repairing");
-          }}
-        />
-      ) : null}
-      {step === "repairing" ? (
-        <RepairRepairingStep
-          brokenParts={scannedBrokenParts}
-          config={config}
-          placeholders={casePlaceholders}
-          onRepair={() => setMissionStep(mission, "reassembling")}
-        />
-      ) : null}
-      {step === "reassembling" ? (
-        <RepairReassemblyStep
-          config={config}
-          onComplete={() => setMissionStep(mission, "done")}
-        />
-      ) : null}
-      {step === "done" ? (
-        <RepairCompletionStep
-          config={config}
-          onComplete={() => completeMission(mission)}
-        />
-      ) : null}
-      {step !== "waiting" && step !== "done" && step !== "reassembling" ? (
-        <RepairMissionCase
-          config={config}
-          onPlaceholdersChange={setCasePlaceholders}
-          open={step === "repairing"}
-          zoomed={step === "repairing"}
-          showFragmentationPrompt={readyForFragmentation}
-        />
-      ) : null}
+      <Suspense fallback={null}>
+        {step === "waiting" ? (
+          <RepairInspectionObject
+            config={config}
+            worldPosition={position}
+            onInspect={() => setMissionStep(mission, "inspected")}
+          />
+        ) : null}
+        {step === "fragmented" ? (
+          <ExplodableModel modelPath={config.modelPath} split />
+        ) : null}
+        {step === "scanning" ? (
+          <RepairScanSequence
+            config={config}
+            onComplete={(brokenParts) => {
+              setScannedBrokenParts(brokenParts);
+              setMissionStep(mission, "repairing");
+            }}
+          />
+        ) : null}
+        {step === "repairing" ? (
+          <RepairRepairingStep
+            brokenParts={scannedBrokenParts}
+            config={config}
+            placeholders={casePlaceholders}
+            onRepair={() => setMissionStep(mission, "reassembling")}
+          />
+        ) : null}
+        {step === "reassembling" ? (
+          <RepairReassemblyStep
+            config={config}
+            onComplete={() => setMissionStep(mission, "done")}
+          />
+        ) : null}
+        {step === "done" ? (
+          <RepairCompletionStep
+            config={config}
+            onComplete={() => completeMission(mission)}
+          />
+        ) : null}
+        {step !== "waiting" && step !== "done" && step !== "reassembling" ? (
+          <RepairMissionCase
+            config={config}
+            onPlaceholdersChange={setCasePlaceholders}
+            open={step === "repairing"}
+            zoomed={step === "repairing"}
+            showFragmentationPrompt={readyForFragmentation}
+          />
+        ) : null}
+      </Suspense>
     </group>
   );
 }
diff --git a/src/world/World.tsx b/src/world/World.tsx
index 2b3aa67..2b5a053 100644
--- a/src/world/World.tsx
+++ b/src/world/World.tsx
@@ -1,3 +1,4 @@
+import { Suspense } from "react";
 import { Physics } from "@react-three/rapier";
 import {
   PLAYER_SPAWN_POSITION_GAME,
@@ -43,10 +44,10 @@ export function World({ onLoadingStateChange }: WorldProps): React.JSX.Element {
       <Lighting />
       <DebugHelpers />
       {showHandTrackingGloves ? (
-        <>
+        <Suspense fallback={null}>
           <HandTrackingGlove handedness="left" />
           <HandTrackingGlove handedness="right" />
-        </>
+        </Suspense>
       ) : null}
       {cameraMode === "debug" ? <DebugCameraControls /> : null}
       {sceneMode === "game" ? (