diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/component.py b/platform/mellanox/mlnx-platform-api/sonic_platform/component.py
index 106aa4d84770..dc09ae4011fa 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/component.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/component.py
@@ -210,8 +210,7 @@ def install_firmware(self, image_path):
             print("ERROR: Installing BIOS failed due to {}".format(repr(e)))
             return False
 
-        print("INFO: Reboot via \"/sbin/reboot\" is required to finish BIOS installation.")
-        print("INFO: Please don't try installing a new sonic image before BIOS installation finishing")
+        print("INFO: Reboot is required to finish BIOS installation.")
         return True
 
 
diff --git a/platform/mellanox/onie-fw-update b/platform/mellanox/onie-fw-update
index 220743694b67..1ffafc45c5ac 100755
--- a/platform/mellanox/onie-fw-update
+++ b/platform/mellanox/onie-fw-update
@@ -61,7 +61,7 @@ change_grub_boot_order()
 	find_onie_menuentry
 	rc=$?
 	if [ $rc -eq 0 ]; then
-		grub-reboot --boot-directory=$os_boot $onie_entry
+		grub-editenv $os_boot/grub/grubenv set onie_entry=ONIE
 	else
 		echo "ERROR: ONIE entry wasn't found in grub config"
 		return 1