diff --git a/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc b/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
index d570e83..26b83e6 100644
--- a/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
+++ b/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
@@ -108,9 +108,12 @@
   rw="${rwmtd#mtd}"
   ubidev="/dev/ubi${rw}"
 
-  rwsize="$(fw_printenv -n rwfs_size)"
-  if [[ "${imgsize}" != "${rwsize}" ]]; then
-    fw_setenv rwfs_size "${imgsize}"
+  # Update rwfs_size, check imgsize was specified, otherwise it'd clear the var
+  if [ ! -z "$imgsize" ]; then
+    rwsize="$(fw_printenv -n rwfs_size 2>/dev/null)" || true
+    if [[ "${imgsize}" != "${rwsize}" ]]; then
+      fw_setenv rwfs_size "${imgsize}"
+    fi
   fi
 
   vol="$(findubi "${name}")"