diff --git a/gns3/items/drawing_item.py b/gns3/items/drawing_item.py
index 7714c36e..afd413cb 100644
--- a/gns3/items/drawing_item.py
+++ b/gns3/items/drawing_item.py
@@ -106,6 +106,11 @@ class DrawingItem:
         """
 
         if error:
+            if "doesn't exist" in result.get("message", ""):
+                log.warning("Drawing not found on server, recreating: {}".format(self._id))
+                self._id = None
+                self.create()
+                return True
             log.error("Error while updating drawing: {}".format(result["message"]))
             return False
         self.setPos(QtCore.QPointF(result["x"], result["y"]))
diff --git a/gns3/items/text_item.py b/gns3/items/text_item.py
index 715646b7..a0d3e9f2 100644
--- a/gns3/items/text_item.py
+++ b/gns3/items/text_item.py
@@ -132,7 +132,7 @@ class TextItem(QtWidgets.QGraphicsTextItem, DrawingItem):
             text.set("text-decoration", "underline")
         text.set("fill", "#" + hex(self.defaultTextColor().rgba())[4:])
         text.set("fill-opacity", str(self.defaultTextColor().alphaF()))
-        text.text = self.toPlainText()
+        text.text = self.toPlainText() or " "
 
         svg = ET.tostring(svg, encoding="utf-8").decode("utf-8")
         return svg