diff --git a/CHANGES.md b/CHANGES.md
index 6bf446afc..9dc3a59a3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -28,6 +28,7 @@
 - Fix problem with rotation degree input [#741](https://github.com/penpot/penpot/issues/741)
 - Fix problem with resolved comments [Taiga #1406](https://tree.taiga.io/project/penpot/issue/1406)
 - Fix problem with comments styles on dashboard [Taiga #1405](https://tree.taiga.io/project/penpot/issue/1405)
+- Fix problem with default square grid [Taiga #1344](https://tree.taiga.io/project/penpot/issue/1344)
 
 ### :heart: Community contributions by (Thank you!)
 
diff --git a/frontend/src/app/main/data/workspace/grid.cljs b/frontend/src/app/main/data/workspace/grid.cljs
index 0b8a9bd82..92a71120c 100644
--- a/frontend/src/app/main/data/workspace/grid.cljs
+++ b/frontend/src/app/main/data/workspace/grid.cljs
@@ -45,7 +45,7 @@
     ptk/WatchEvent
     (watch [_ state stream]
       (let [page-id (:current-page-id state)
-            data    (get-in state [:workspace-data page-id])
+            data    (get-in state [:workspace-data :pages-index page-id])
             params  (or (get-in data [:options :saved-grids :square])
                         (:square default-grid-params))
             grid    {:type :square