diff --git a/packages/client/src/utils/grid.js b/packages/client/src/utils/grid.js
index 388921cfb7..1727b904ca 100644
--- a/packages/client/src/utils/grid.js
+++ b/packages/client/src/utils/grid.js
@@ -118,8 +118,8 @@ export const gridLayout = (node, metadata) => {
     for (let param of Object.values(GridParams)) {
       let dVar = getGridVar(Devices.Desktop, param)
       let mVar = getGridVar(Devices.Mobile, param)
-      vars[dVar] = styles[dVar] || styles[mVar] || defaults[param]
-      vars[mVar] = styles[mVar] || styles[dVar] || defaults[param]
+      vars[dVar] = styles[dVar] ?? styles[mVar] ?? defaults[param]
+      vars[mVar] = styles[mVar] ?? styles[dVar] ?? defaults[param]
     }
 
     // Apply some overrides depending on component state