diff --git a/Source/Core/Core/HW/EXI/BBA/TAP_Win32.cpp b/Source/Core/Core/HW/EXI/BBA/TAP_Win32.cpp
index 57e2418b87..1f3b9fcbcd 100644
--- a/Source/Core/Core/HW/EXI/BBA/TAP_Win32.cpp
+++ b/Source/Core/Core/HW/EXI/BBA/TAP_Win32.cpp
@@ -66,11 +66,16 @@ bool IsTAPDevice(const TCHAR* guid)
 
         if (status == ERROR_SUCCESS && data_type == REG_SZ)
         {
-          if (!_tcscmp(component_id, TAP_COMPONENT_ID) && !_tcscmp(net_cfg_instance_id, guid))
+          TCHAR* const component_id_sub = _tcsstr(component_id, TAP_COMPONENT_ID);
+
+          if (component_id_sub)
           {
-            RegCloseKey(unit_key);
-            RegCloseKey(netcard_key);
-            return true;
+            if (!_tcscmp(component_id_sub, TAP_COMPONENT_ID) && !_tcscmp(net_cfg_instance_id, guid))
+            {
+              RegCloseKey(unit_key);
+              RegCloseKey(netcard_key);
+              return true;
+            }
           }
         }
       }