diff --git a/src/components/Item.tsx b/src/components/Item.tsx
index 1b26287e..19413399 100644
--- a/src/components/Item.tsx
+++ b/src/components/Item.tsx
@@ -33,7 +33,7 @@ function ShapeModel({ shapeName }: { shapeName: string }) {
             !node.material || !node.material.name.match(/\.\d+$/)
         )
         .map(([name, node]: [string, any]) => (
-          <mesh geometry={node.geometry} castShadow receiveShadow>
+          <mesh key={node.id} geometry={node.geometry} castShadow receiveShadow>
             <meshStandardMaterial color="cyan" wireframe />
           </mesh>
         ))}
diff --git a/src/components/StaticShape.tsx b/src/components/StaticShape.tsx
index 01895097..22c8b345 100644
--- a/src/components/StaticShape.tsx
+++ b/src/components/StaticShape.tsx
@@ -34,7 +34,7 @@ function ShapeModel({ shapeName }: { shapeName: string }) {
             !node.material || !node.material.name.match(/\.\d+$/)
         )
         .map(([name, node]: [string, any]) => (
-          <mesh geometry={node.geometry} castShadow receiveShadow>
+          <mesh key={node.id} geometry={node.geometry} castShadow receiveShadow>
             <meshStandardMaterial color="cyan" wireframe />
           </mesh>
         ))}
diff --git a/src/components/TSStatic.tsx b/src/components/TSStatic.tsx
index f85b1f74..6fbc1c7d 100644
--- a/src/components/TSStatic.tsx
+++ b/src/components/TSStatic.tsx
@@ -19,9 +19,22 @@ function useStaticShape(shapeName: string) {
 }
 
 function ShapeModel({ shapeName }: { shapeName: string }) {
-  const { scene } = useStaticShape(shapeName);
+  const { nodes } = useStaticShape(shapeName);
 
-  return <primitive object={scene} />;
+  return (
+    <>
+      {Object.entries(nodes)
+        .filter(
+          ([name, node]: [string, any]) =>
+            !node.material || !node.material.name.match(/\.\d+$/)
+        )
+        .map(([name, node]: [string, any]) => (
+          <mesh key={node.id} geometry={node.geometry} castShadow receiveShadow>
+            <meshStandardMaterial color="cyan" wireframe />
+          </mesh>
+        ))}
+    </>
+  );
 }
 
 function ShapePlaceholder({ color }: { color: string }) {