diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp
index 8e4a33d099..9ecb8bb266 100644
--- a/Source/Core/DiscIO/VolumeGC.cpp
+++ b/Source/Core/DiscIO/VolumeGC.cpp
@@ -74,13 +74,11 @@ std::string VolumeGC::GetGameID(const Partition& partition) const
 
 std::string VolumeGC::GetGameTDBID(const Partition& partition) const
 {
-  const std::string game_id = GetGameID(partition);
-
-  // Don't return an ID for Datel discs that are using the game ID of NHL Hitz 2002
-  if (game_id == "GNHE5d" && !GetBootDOLOffset(*this, partition).has_value())
+  // Don't return an ID for Datel discs
+  if (!GetBootDOLOffset(*this, PARTITION_NONE).has_value())
     return "";
 
-  return game_id;
+  return GetGameID(partition);
 }
 
 Region VolumeGC::GetRegion() const
diff --git a/Source/Core/DiscIO/VolumeWii.cpp b/Source/Core/DiscIO/VolumeWii.cpp
index 5b6524f807..bc39a7aae4 100644
--- a/Source/Core/DiscIO/VolumeWii.cpp
+++ b/Source/Core/DiscIO/VolumeWii.cpp
@@ -313,6 +313,10 @@ std::string VolumeWii::GetGameID(const Partition& partition) const
 
 std::string VolumeWii::GetGameTDBID(const Partition& partition) const
 {
+  // Don't return an ID for Datel discs
+  if (m_game_partition == PARTITION_NONE)
+    return "";
+
   return GetGameID(partition);
 }