diff --git a/src/frontend/src/CustomNodes/GenericNode/components/handleRenderComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/handleRenderComponent/index.tsx
index 8a1c88d7a..74e3fc6b4 100644
--- a/src/frontend/src/CustomNodes/GenericNode/components/handleRenderComponent/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/components/handleRenderComponent/index.tsx
@@ -3,7 +3,6 @@ import useFlowStore from "@/stores/flowStore";
 import { nodeColorsName } from "@/utils/styleUtils";
 import { Connection, Handle, Position } from "@xyflow/react";
 import { memo, useCallback, useEffect, useMemo, useState } from "react";
-import { useShallow } from "zustand/react/shallow";
 import ShadTooltip from "../../../../components/common/shadTooltipComponent";
 import {
   isValidConnection,
@@ -180,10 +179,6 @@ const HandleRenderComponent = memo(function HandleRenderComponent({
   const [isHovered, setIsHovered] = useState(false);
   const [openTooltip, setOpenTooltip] = useState(false);
 
-  const isLocked = useFlowStore(
-    useShallow((state) => state.currentFlow?.locked),
-  );
-
   const {
     setHandleDragging,
     setFilterType,
@@ -389,10 +384,16 @@ const HandleRenderComponent = memo(function HandleRenderComponent({
     [],
   );
 
+  // Memoize the validation function
+  const validateConnection = useCallback(
+    (connection: any) => isValidConnection(connection),
+    [],
+  );
+
   return (
     <div>
       <ShadTooltip
-        open={openTooltip && !isLocked}
+        open={openTooltip}
         setOpen={setOpenTooltip}
         styleClasses={cn("tooltip-fixed-width custom-scroll nowheel bottom-2")}
         delayDuration={1000}
@@ -413,16 +414,13 @@ const HandleRenderComponent = memo(function HandleRenderComponent({
           position={left ? Position.Left : Position.Right}
           id={myId}
           isValidConnection={(connection) =>
-            isLocked ? false : isValidConnection(connection as Connection)
+            isValidConnection(connection as Connection)
           }
           className={cn(
             `group/handle z-50 transition-all`,
             !showNode && "no-show",
           )}
-          style={{
-            ...BASE_HANDLE_STYLES,
-            pointerEvents: isLocked ? "none" : "auto",
-          }}
+          style={BASE_HANDLE_STYLES}
           onClick={handleClick}
           onMouseUp={handleMouseUp}
           onContextMenu={handleContextMenu}
diff --git a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
index 5fc90cc19..3d62dd09b 100644
--- a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
@@ -34,7 +34,6 @@ import {
   useState,
 } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
-import { useShallow } from "zustand/react/shallow";
 import GenericNode from "../../../../CustomNodes/GenericNode";
 import {
   INVALID_SELECTION_ERROR_ALERT,
@@ -125,10 +124,6 @@ export default function Page({
   const [selectionMenuVisible, setSelectionMenuVisible] = useState(false);
   const edgeUpdateSuccessful = useRef(true);
 
-  const isLocked = useFlowStore(
-    useShallow((state) => state.currentFlow?.locked),
-  );
-
   const position = useRef({ x: 0, y: 0 });
   const [lastSelection, setLastSelection] =
     useState<OnSelectionChangeParams | null>(null);
@@ -526,11 +521,6 @@ export default function Page({
   );
 
   const handleEdgeClick = (event, edge) => {
-    if (isLocked) {
-      event.preventDefault();
-      event.stopPropagation();
-      return;
-    }
     const color =
       nodeColorsName[edge?.data?.sourceHandle?.output_types[0]] || "cyan";
 
@@ -594,13 +584,13 @@ export default function Page({
             edges={edges}
             onNodesChange={onNodesChange}
             onEdgesChange={onEdgesChange}
-            onConnect={isLocked ? undefined : onConnectMod}
+            onConnect={onConnectMod}
             disableKeyboardA11y={true}
             onInit={setReactFlowInstance}
             nodeTypes={nodeTypes}
-            onReconnect={isLocked ? undefined : onEdgeUpdate}
-            onReconnectStart={isLocked ? undefined : onEdgeUpdateStart}
-            onReconnectEnd={isLocked ? undefined : onEdgeUpdateEnd}
+            onReconnect={onEdgeUpdate}
+            onReconnectStart={onEdgeUpdateStart}
+            onReconnectEnd={onEdgeUpdateEnd}
             onNodeDragStart={onNodeDragStart}
             onSelectionDragStart={onSelectionDragStart}
             elevateEdgesOnSelect={true}
diff --git a/src/frontend/tests/extended/features/lock-flow.spec.ts b/src/frontend/tests/extended/features/lock-flow.spec.ts
index 2ace3d8e6..e0435b5c7 100644
--- a/src/frontend/tests/extended/features/lock-flow.spec.ts
+++ b/src/frontend/tests/extended/features/lock-flow.spec.ts
@@ -1,4 +1,4 @@
-import { expect, Page, test } from "@playwright/test";
+import { test } from "@playwright/test";
 import * as dotenv from "dotenv";
 import path from "path";
 import { awaitBootstrapTest } from "../../utils/await-bootstrap-test";
@@ -74,42 +74,5 @@ test(
       timeout: 3000,
       state: "visible",
     });
-
-    await tryDeleteEdge(page);
-    await page.locator(".react-flow__edge-path").nth(0).click();
-    await page.keyboard.press("Delete");
-    let numberOfEdges = await page.locator(".react-flow__edge-path").count();
-    expect(numberOfEdges).toBe(2);
-
-    await page.locator(".react-flow__edge-path").nth(0).click();
-    await page.keyboard.press("Delete");
-    numberOfEdges = await page.locator(".react-flow__edge-path").count();
-    expect(numberOfEdges).toBe(1);
-
-    await page.locator(".react-flow__edge-path").nth(0).click();
-    await page.keyboard.press("Delete");
-    numberOfEdges = await page.locator(".react-flow__edge-path").count();
-    expect(numberOfEdges).toBe(0);
   },
 );
-
-async function tryDeleteEdge(page: Page) {
-  await page.getByTestId("lock_unlock").click();
-
-  let numberOfEdges = await page.locator(".react-flow__edge-path").count();
-  expect(numberOfEdges).toBe(3);
-  const numberOfTries = 50;
-
-  for (let i = 0; i < numberOfTries; i++) {
-    await page.locator(".react-flow__edge-path").nth(0).click();
-    await page.keyboard.press("Delete");
-    await page.locator(".react-flow__edge-path").nth(1).click();
-    await page.keyboard.press("Delete");
-    await page.locator(".react-flow__edge-path").nth(2).click();
-    await page.keyboard.press("Delete");
-    numberOfEdges = await page.locator(".react-flow__edge-path").count();
-    expect(numberOfEdges).toBe(3);
-  }
-  //unlock the flow
-  await page.getByTestId("lock_unlock").click();
-}