diff --git a/app/components/chat/Artifact.tsx b/app/components/chat/Artifact.tsx
index 5f0c991..21c9f9a 100644
--- a/app/components/chat/Artifact.tsx
+++ b/app/components/chat/Artifact.tsx
@@ -33,8 +33,13 @@ export const Artifact = memo(({ messageId }: ArtifactProps) => {
   const artifacts = useStore(workbenchStore.artifacts);
   const artifact = artifacts[messageId];
 
+  // Early return if no artifact exists
+  if (!artifact) {
+    return null;
+  }
+
   const actions = useStore(
-    computed(artifact.runner.actions, (actions) => {
+    computed(artifact?.runner?.actions ?? [], (actions) => {
       return Object.values(actions);
     }),
   );