diff --git a/example/src/Hidden/index.tsx b/example/src/Hidden/index.tsx
index 4ac8eaa4..4957c046 100644
--- a/example/src/Hidden/index.tsx
+++ b/example/src/Hidden/index.tsx
@@ -33,7 +33,7 @@ const HiddenFlow = () => {
 
   useEffect(() => {
     setNodes(setHidden(isHidden));
-    setNodes(setHidden(isHidden));
+    setEdges(setHidden(isHidden));
   }, [isHidden]);
 
   return (
diff --git a/src/components/Nodes/wrapNode.tsx b/src/components/Nodes/wrapNode.tsx
index 20348106..dc3a495a 100644
--- a/src/components/Nodes/wrapNode.tsx
+++ b/src/components/Nodes/wrapNode.tsx
@@ -204,13 +204,13 @@ export default (NodeComponent: ComponentType<NodeProps>) => {
     );
 
     useEffect(() => {
-      if (nodeElement.current) {
+      if (nodeElement.current && !hidden) {
         const currNode = nodeElement.current;
         resizeObserver?.observe(currNode);
 
         return () => resizeObserver?.unobserve(currNode);
       }
-    }, []);
+    }, [hidden]);
 
     if (hidden) {
       return null;
diff --git a/src/container/EdgeRenderer/index.tsx b/src/container/EdgeRenderer/index.tsx
index ff6794da..a5c0e426 100644
--- a/src/container/EdgeRenderer/index.tsx
+++ b/src/container/EdgeRenderer/index.tsx
@@ -41,6 +41,7 @@ interface EdgeRendererProps {
 
 interface EdgeWrapperProps {
   edge: Edge;
+  hidden: boolean;
   edgeTypes: any;
   markerEndId?: string;
   onEdgeClick?: (event: React.MouseEvent, node: Edge) => void;
@@ -71,6 +72,7 @@ interface EdgeWrapperProps {
 const Edge = memo(
   ({
     edge,
+    hidden,
     edgeTypes,
     markerEndId,
     onEdgeClick,
@@ -194,7 +196,7 @@ const Edge = memo(
         targetPosition={targetPosition}
         elementsSelectable={elementsSelectable}
         markerEndId={markerEndId}
-        hidden={edge.hidden}
+        hidden={hidden}
         onConnectEdge={onConnectEdge}
         handleEdgeUpdate={typeof onEdgeUpdate !== 'undefined'}
         onContextMenu={onEdgeContextMenu}
@@ -265,6 +267,7 @@ const EdgeRenderer = (props: EdgeRendererProps) => {
                 <Edge
                   key={edge.id}
                   edge={edge}
+                  hidden={!!edge.hidden}
                   sourceNodeWidth={sourceNode?.width}
                   sourceNodeHeight={sourceNode?.height}
                   sourceNodeX={sourceNode?.positionAbsolute?.x}