diff --git a/packages/frontend-core/src/components/grid/stores/ui.js b/packages/frontend-core/src/components/grid/stores/ui.js
index 168b0c8184..7b4a9534c6 100644
--- a/packages/frontend-core/src/components/grid/stores/ui.js
+++ b/packages/frontend-core/src/components/grid/stores/ui.js
@@ -193,5 +193,9 @@ export const initialise = context => {
   })
 
   // Reset row height when initial row height prop changes
-  initialRowHeight.subscribe(rowHeight.set)
+  initialRowHeight.subscribe(height => {
+    if (height) {
+      rowHeight.set(height)
+    }
+  })
 }