diff --git a/CHANGES.md b/CHANGES.md
index 45d018adf..b9a39c120 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -48,6 +48,7 @@
 - Fix problem with comments when user left the team [Taiga #5562](https://tree.taiga.io/project/penpot/issue/5562)
 - Fix problem with images patterns repeating [#3372](https://github.com/penpot/penpot/issues/3372)
 - Fix grid not being clipped in frames [#3365](https://github.com/penpot/penpot/issues/3365)
+- Fix cut/delete text layer when while creating text [Taiga #5602](https://tree.taiga.io/project/penpot/issue/5602)
 
 ### :arrow_up: Deps updates
 
diff --git a/frontend/src/app/main/data/workspace/texts.cljs b/frontend/src/app/main/data/workspace/texts.cljs
index a9a3f4fe7..24bb875f3 100644
--- a/frontend/src/app/main/data/workspace/texts.cljs
+++ b/frontend/src/app/main/data/workspace/texts.cljs
@@ -142,7 +142,8 @@
               (rx/merge
                (rx/of (update-editor-state shape nil))
                (when (and (not= content (:content shape))
-                          (some? (:current-page-id state)))
+                          (some? (:current-page-id state))
+                          (some? shape))
                  (rx/of
                   (dch/update-shapes
                    [id]