diff --git a/source/main.cpp b/source/main.cpp
index f1e5467d..53a5abbe 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -65,7 +65,8 @@ int main(int argc, char **argv)
 	/* Handle (c)IOS Loading */
 	if(neek2o() || Sys_DolphinMode())
 		iosOK = loadIOS(IOS_GetVersion(), false);
-	else if(AHBRPOT_Patched() && IOS_GetVersion() == 58)
+	else if((AHBRPOT_Patched() && IOS_GetVersion() == 58) || /* Normal HBC or FW Boot */
+	(!AHBRPOT_Patched() && IOS_GetType(mainIOS) == IOS_TYPE_STUB)) /* Maybe old HBC or WiiU */
 		iosOK = loadIOS(58, false);
 	else /* cIOS wanted */
 		iosOK = loadIOS(mainIOS, false) && CustomIOS(CurrentIOS.Type);