diff --git a/core/emulator.cpp b/core/emulator.cpp
index cb8497405..4ffabde71 100644
--- a/core/emulator.cpp
+++ b/core/emulator.cpp
@@ -444,7 +444,7 @@ void Emulator::loadGame(const char *path, LoadProgress *progress)
 
 		if (settings.platform.system == DC_PLATFORM_DREAMCAST)
 		{
-			if (path == NULL)
+			if (settings.content.path.empty())
 			{
 				// Boot BIOS
 				if (!LoadRomFiles())
diff --git a/core/imgread/common.cpp b/core/imgread/common.cpp
index 00fa69b73..f9adb275b 100644
--- a/core/imgread/common.cpp
+++ b/core/imgread/common.cpp
@@ -157,6 +157,7 @@ bool DiscSwap(const std::string& path)
 
 	if (path.empty())
 	{
+		TermDrive();
 		NullDriveDiscType = NoDisk;
 		gd_setdisc();
 		return true;