diff --git a/frontend/src/components/visual-editor/v2/Diagrams.tsx b/frontend/src/components/visual-editor/v2/Diagrams.tsx
index 924cb9ba..70b22f6e 100644
--- a/frontend/src/components/visual-editor/v2/Diagrams.tsx
+++ b/frontend/src/components/visual-editor/v2/Diagrams.tsx
@@ -519,9 +519,11 @@ const Diagrams = () => {
       className="visual-editor"
       id="visual-editor"
       onDrop={(event) => {
-        const data = JSON.parse(
-          event.dataTransfer.getData("storm-diagram-node"),
-        );
+        const stormDiagramNode =
+          event.dataTransfer.getData("storm-diagram-node");
+
+        if (!stormDiagramNode) return;
+        const data = JSON.parse(stormDiagramNode);
 
         if (!data) {
           // eslint-disable-next-line no-console