diff --git a/packages/app/src/app/overmind/namespaces/editor/actions.ts b/packages/app/src/app/overmind/namespaces/editor/actions.ts
index 341713225ac..c9e763a22c7 100755
--- a/packages/app/src/app/overmind/namespaces/editor/actions.ts
+++ b/packages/app/src/app/overmind/namespaces/editor/actions.ts
@@ -1481,8 +1481,8 @@ export const updateComment: AsyncAction<{
     comment?: string;
     isResolved: boolean;
   };
-}> = async ({ state, effects }, { id, data }) => {
-  if (!state.editor.currentSandbox) {
+}> = async ({ effects, state }, { id, data }) => {
+  if (!state.editor.currentSandbox || !state.editor.currentComment) {
     return;
   }
   const sandboxId = state.editor.currentSandbox.id;