diff --git a/installer/default_platform.conf b/installer/default_platform.conf
index fca775447692..7a9fe00ecf4e 100755
--- a/installer/default_platform.conf
+++ b/installer/default_platform.conf
@@ -264,14 +264,6 @@ demo_install_grub()
         exit 1
     }
 
-    # Create a blank environment block file.
-    if [ ! -f "$onie_initrd_tmp/$demo_mnt/grub/grubenv" ]; then
-        grub-editenv "$onie_initrd_tmp/$demo_mnt/grub/grubenv" create || {
-            echo "ERROR: grub-editenv failed on: $blk_dev"
-            exit 1
-        }
-    fi
-
     if [ "$demo_type" = "DIAG" ] ; then
         # Install GRUB in the partition also.  This allows for
         # chainloading the DIAG image from another OS.
@@ -354,14 +346,6 @@ demo_install_uefi_grub()
     }
     rm -f $grub_install_log
 
-    # Create a blank environment block file.
-    if [ ! -f "$demo_mnt/grub/grubenv" ]; then
-        grub-editenv "$demo_mnt/grub/grubenv" create || {
-            echo "ERROR: grub-editenv failed on: $blk_dev"
-            exit 1
-        }
-    fi
-
     # Configure EFI NVRAM Boot variables.  --create also sets the
     # new boot number as active.
     grub=$(find /boot/efi/EFI/$demo_volume_label/ -name grub*.efi -exec basename {} \;)
@@ -631,6 +615,14 @@ EOF
         umount $demo_mnt
     else
         cp $grub_cfg $onie_initrd_tmp/$demo_mnt/grub/grub.cfg
+
+        # Create a blank environment block file.
+        if [ ! -f "$onie_initrd_tmp/$demo_mnt/grub/grubenv" ]; then
+            grub-editenv "$onie_initrd_tmp/$demo_mnt/grub/grubenv" create || {
+                echo "ERROR: grub-editenv failed on: $blk_dev"
+                exit 1
+            }
+        fi
     fi
 
     cd /