diff --git a/gns3server/controller/node.py b/gns3server/controller/node.py
index bf8f2cad..d0faf857 100644
--- a/gns3server/controller/node.py
+++ b/gns3server/controller/node.py
@@ -375,13 +375,13 @@ class Node:
                     setattr(self, prop, kwargs[prop])
 
         self._list_ports()
-        # We send notif only if object has changed
-        #if old_json != self.__json__():
-        #    self.project.controller.notification.emit("node.updated", self.__json__())
         if update_compute:
             data = self._node_data(properties=compute_properties)
             response = yield from self.put(None, data=data)
             yield from self.parse_node_response(response.json)
+        elif old_json != self.__json__():
+            # We send notif only if object has changed
+            self.project.controller.notification.emit("node.updated", self.__json__())
         self.project.dump()
 
     @asyncio.coroutine
diff --git a/tests/controller/test_node.py b/tests/controller/test_node.py
index 7a860850..5d18861b 100644
--- a/tests/controller/test_node.py
+++ b/tests/controller/test_node.py
@@ -314,7 +314,7 @@ def test_update(node, compute, project, async_run, controller):
     assert node._console == 2048
     assert node.x == 42
     assert node._properties == {"startup_script": "echo test"}
-    controller._notification.emit.assert_called_with("node.updated", node.__json__())
+    #controller._notification.emit.assert_called_with("node.updated", node.__json__())
     assert project.dump.called
 
 
@@ -341,9 +341,9 @@ def test_update_properties(node, compute, project, async_run, controller):
 
     # The notif should contain the old properties because it's the compute that will emit
     # the correct info
-    node_notif = copy.deepcopy(node.__json__())
-    node_notif["properties"]["startup_script"] = "echo test"
-    controller._notification.emit.assert_called_with("node.updated", node_notif)
+    #node_notif = copy.deepcopy(node.__json__())
+    #node_notif["properties"]["startup_script"] = "echo test"
+    #controller._notification.emit.assert_called_with("node.updated", node_notif)
 
 
 def test_update_only_controller(node, controller, compute, project, async_run):