diff --git a/src/frontend/src/CustomEdges/index.tsx b/src/frontend/src/CustomEdges/index.tsx
index edbb0f6add..1bd2525e39 100644
--- a/src/frontend/src/CustomEdges/index.tsx
+++ b/src/frontend/src/CustomEdges/index.tsx
@@ -7,6 +7,12 @@ import {
 import useFlowStore from "@/stores/flowStore";
 import { scapeJSONParse } from "@/utils/reactflowUtils";
 
+const UNRECOGNIZED_DOM_PROPS = [
+  "targetPosition",
+  "sourcePosition",
+  "pathOptions",
+];
+
 export function DefaultEdge({
   sourceHandleId,
   source,
@@ -63,6 +69,13 @@ export function DefaultEdge({
 
   const { animated, selectable, deletable, selected, ...domSafeProps } = props;
 
+  //Remove unrecognized DOM props
+  UNRECOGNIZED_DOM_PROPS.forEach((prop) => {
+    if (prop in domSafeProps) {
+      delete domSafeProps[prop];
+    }
+  });
+
   return (
     <BaseEdge
       path={targetHandleObject.output_types ? edgePathLoop : edgePath}
diff --git a/src/frontend/src/pages/FlowPage/components/PageComponent/MemoizedComponents.tsx b/src/frontend/src/pages/FlowPage/components/PageComponent/MemoizedComponents.tsx
index 1bc1cbeda3..a478aed1d4 100644
--- a/src/frontend/src/pages/FlowPage/components/PageComponent/MemoizedComponents.tsx
+++ b/src/frontend/src/pages/FlowPage/components/PageComponent/MemoizedComponents.tsx
@@ -78,6 +78,7 @@ export const MemoizedSidebarTrigger = memo(() => {
             data-testid={`sidebar-trigger-${item.id}`}
             iconName={item.icon}
             iconClasses={item.id === "mcp" ? "h-8 w-8" : ""}
+            key={item.id}
             tooltipText={item.tooltip}
             onClick={() => {
               setActiveSection(item.id);
diff --git a/src/frontend/src/pages/FlowPage/components/flowSidebarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/flowSidebarComponent/index.tsx
index cca279acaf..8bee6ad8e5 100644
--- a/src/frontend/src/pages/FlowPage/components/flowSidebarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/flowSidebarComponent/index.tsx
@@ -281,8 +281,6 @@ export function FlowSidebarComponent({ isLoading }: FlowSidebarComponentProps) {
         mcpCategoryData[mcp.display_name] = mcp;
       });
 
-      console.log("mcpCategoryData", mcpCategoryData);
-
       return {
         ...data,
         MCP: mcpCategoryData,