diff --git a/source/DiskImage.cpp b/source/DiskImage.cpp
index ff25f5c1..4ccc160c 100644
--- a/source/DiskImage.cpp
+++ b/source/DiskImage.cpp
@@ -68,11 +68,7 @@ ImageError_e ImageOpen(	const std::string & pszImageFilename,
 	if (pImageInfo->pImageType && pImageInfo->pImageType->GetType() == eImageHDV)
 	{
 		if (bExpectFloppy)
-		{
 			Err = eIMAGE_ERROR_UNSUPPORTED_HDV;
-			ImageClose(*ppImageInfo);
-			*ppImageInfo = NULL;
-		}
 		return Err;
 	}
 
diff --git a/source/Windows/WinFrame.cpp b/source/Windows/WinFrame.cpp
index ebdaf8d7..6fe59df7 100644
--- a/source/Windows/WinFrame.cpp
+++ b/source/Windows/WinFrame.cpp
@@ -1078,14 +1078,6 @@ LRESULT Win32Frame::WndProc(
 					ProcessButtonClick(BTN_RUN);
 				}
 			}
-			else if (Error == eIMAGE_ERROR_UNSUPPORTED_HDV)
-			{
-				if (HD_CardIsEnabled() && DoHardDiskInsert(HARDDISK_1, filename))
-				{
-					SetForegroundWindow(window);
-					ProcessButtonClick(BTN_RUN);
-				}
-			}
 			else
 			{
 				disk2Card.NotifyInvalidImage(iDrive, filename, Error);