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 73f7b51..8d49f50 100644
--- a/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
+++ b/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
@@ -217,9 +217,13 @@
 
 ubi_setenv() {
     variable=$1
-    varName="${variable%=*}"
-    value="${variable##*=}"
-    fw_setenv "$varName" "$value"
+    if [[ "$variable" == *"="* ]]; then
+        varName="${variable%=*}"
+        value="${variable##*=}"
+        fw_setenv "$varName" "$value"
+    else
+        fw_setenv "$variable"
+    fi
 }
 
 mtd_write() {