diff --git a/src/Model/Reservoir/Reservoir.py b/src/Model/Reservoir/Reservoir.py
index 0514c828..2e5037d5 100644
--- a/src/Model/Reservoir/Reservoir.py
+++ b/src/Model/Reservoir/Reservoir.py
@@ -157,7 +157,7 @@ class Data(SQLSubModel):
                 owner_scenario=owner_scenario
             )
             if deleted:
-                f.set_as_deleted()
+                nd.set_as_deleted()
 
             nd._data = [elevation, surface]
 
@@ -307,7 +307,7 @@ class Reservoir(SQLSubModel):
                 owner_scenario=owner_scenario
             )
             if deleted:
-                f.set_as_deleted()
+                new_reservoir.set_as_deleted()
 
             new_reservoir._node = None
             if node_id != -1:
diff --git a/src/View/Network/GraphWidget.py b/src/View/Network/GraphWidget.py
index ed25f497..01d5b40a 100644
--- a/src/View/Network/GraphWidget.py
+++ b/src/View/Network/GraphWidget.py
@@ -73,10 +73,13 @@ class NodeItem(QGraphicsItem):
 
     def shape(self):
         path = QPainterPath()
-        if self.graph.graph._reservoir.get_assoc_to_node(self.node) is None:
+        reservoir = self.graph.graph._reservoir.get_assoc_to_node(self.node)
+
+        if reservoir is None or reservoir.is_deleted():
             path.addEllipse(-10, -10, 20, 20)
         else:
             path.addRect(-10, -10, 20, 20)
+
         return path
 
     @timer
@@ -98,7 +101,9 @@ class NodeItem(QGraphicsItem):
             color = Qt.green
 
         painter.setBrush(QBrush(color))
-        if self.graph.graph._reservoir.get_assoc_to_node(self.node) is None:
+        reservoir = self.graph.graph._reservoir.get_assoc_to_node(self.node)
+
+        if reservoir is None or reservoir.is_deleted():
             painter.drawEllipse(-10, -10, 20, 20)
         else:
             painter.drawRect(-10, -10, 20, 20)