diff --git a/source/system/IosLoader.cpp b/source/system/IosLoader.cpp
index 26853bf0..ab3b8761 100644
--- a/source/system/IosLoader.cpp
+++ b/source/system/IosLoader.cpp
@@ -174,6 +174,7 @@ s32 IosLoader::LoadGameCios(s32 ios)
 	WBFS_CloseAll();
 	WDVD_Close();
 	DeviceHandler::Instance()->UnMountSD();
+	DeviceHandler::Instance()->UnMountAllUSB();
 	DeviceHandler::DestroyInstance();
 	USBStorage2_Deinit();
 
diff --git a/source/usbloader/usbstorage2.c b/source/usbloader/usbstorage2.c
index 30320113..79c7e350 100644
--- a/source/usbloader/usbstorage2.c
+++ b/source/usbloader/usbstorage2.c
@@ -119,6 +119,10 @@ void USBStorage2_Deinit()
 		MEM2_free(mem2_ptr);
 		mem2_ptr = NULL;
 	}
+	if (usb2_port > 0)
+	{
+		usb2_port = 0;
+	}
 }
 
 s32 USBStorage2_SetPort(u32 port)