diff --git a/bootloader/storage/emummc.c b/bootloader/storage/emummc.c
index b1e14a41..6e55272c 100644
--- a/bootloader/storage/emummc.c
+++ b/bootloader/storage/emummc.c
@@ -284,15 +284,11 @@ int emummc_storage_set_mmc_partition(u32 partition)
 {
 	emu_cfg.active_part = partition;
 
-	if(h_cfg.emummc_force_disable){
+	if(h_cfg.emummc_force_disable || !emu_cfg.enabled){
 		emmc_set_partition(partition);
 		return 1;
 	}
 
-	if(!emu_cfg.enabled){
-		return 1;
-	}
-
 	if(!emu_cfg.sector){
 		emummc_storage_file_base_set_partition(partition);
 		return 1;