diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
index b9ecae74c4..c9eb7a7353 100644
--- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
+++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
@@ -340,6 +340,18 @@ void GetNewStorageDevices( vector<UsbStorageDeviceEx>& vDevicesOut )
 			}
 		}
 	}
+
+	/* Remove any devices that we couldn't find a mountpoint for. */
+	for( unsigned i=0; i<vDevicesOut.size(); i++ )
+	{
+		UsbStorageDevice& usbd = vDevicesOut[i];
+		if( usbd.sOsMountDir.empty() )
+		{
+			vDevicesOut.erase( vDevicesOut.begin()+i );
+			--i;
+		}
+	}
+
 }
 
 void MemoryCardDriverThreaded_Linux::Mount( UsbStorageDevice* pDevice, CString sMountPoint )