diff --git a/Source/Core/Core/Src/HW/SerialInterface.cpp b/Source/Core/Core/Src/HW/SerialInterface.cpp
index 24b0b9c7fc..ac33eb92fd 100644
--- a/Source/Core/Core/Src/HW/SerialInterface.cpp
+++ b/Source/Core/Core/Src/HW/SerialInterface.cpp
@@ -241,7 +241,7 @@ void Init()
 		g_Channel[i].m_InLo.Hex = 0;		
 	}	
 
-	unsigned int AttachedPadMask = PluginPAD::PAD_GetAttachedPads();
+	unsigned int AttachedPadMask = PluginPAD::PAD_GetAttachedPads ? PluginPAD::PAD_GetAttachedPads() : 1;
 	for (int i = 0; i < 4; i++)
 	{
 		if (AttachedPadMask & (1 << i))
diff --git a/Source/Core/Core/Src/Plugins/Plugin_PAD.cpp b/Source/Core/Core/Src/Plugins/Plugin_PAD.cpp
index e187c23631..ccb682fda1 100644
--- a/Source/Core/Core/Src/Plugins/Plugin_PAD.cpp
+++ b/Source/Core/Core/Src/Plugins/Plugin_PAD.cpp
@@ -71,7 +71,6 @@ bool LoadPlugin(const char *_Filename)
 			(PAD_Initialize != 0) &&
 			(PAD_Shutdown != 0) &&
 			(PAD_GetStatus != 0))
-			//(PAD_Rumble != 0))
 		{
 			return true;
 		}