diff --git a/core/cheats.cpp b/core/cheats.cpp
index a14cd2641..77bdd50e6 100644
--- a/core/cheats.cpp
+++ b/core/cheats.cpp
@@ -505,6 +505,12 @@ void CheatManager::reset(const std::string& gameId)
 			cheats.emplace_back(Cheat::Type::setValue, "increase datapump timeout", true, 16, 0x00135588, 1000);
 			cheats.back().builtIn = true;
 		}
+		else if (gameId == "SAMURAI SPIRITS 6" || gameId == "T0002M")
+		{
+			setActive(true);
+			cheats.emplace_back(Cheat::Type::setValue, "fix depth", true, 16, 0x0003e602, 0x0009); // nop (shift by 8 bits instead of 10)
+			cheats.back().builtIn = true;
+		}
 	}
 	if (config::WidescreenGameHacks)
 	{
diff --git a/core/emulator.cpp b/core/emulator.cpp
index 53c617f14..983bc5200 100644
--- a/core/emulator.cpp
+++ b/core/emulator.cpp
@@ -157,12 +157,6 @@ static void loadSpecialSettings()
 			INFO_LOG(BOOT, "Enabling Extra depth scaling for game %s", prod_id.c_str());
 			config::ExtraDepthScale.override(100.f);
 		}
-		// Samurai Shodown 6 dc port
-		else if (prod_id == "T0002M")
-		{
-			INFO_LOG(BOOT, "Enabling Extra depth scaling for game %s", prod_id.c_str());
-			config::ExtraDepthScale.override(1e26f);
-		}
 		// Test Drive V-Rally
 		else if (prod_id == "T15110N" || prod_id == "T15105D 50")
 		{
@@ -297,11 +291,6 @@ static void loadSpecialSettings()
 	}
 	else if (settings.platform.isArcade())
 	{
-		if (prod_id == "SAMURAI SPIRITS 6")
-		{
-			INFO_LOG(BOOT, "Enabling Extra depth scaling for game %s", prod_id.c_str());
-			config::ExtraDepthScale.override(1e26f);
-		}
 		if (prod_id == "COSMIC SMASH IN JAPAN")
 		{
 			INFO_LOG(BOOT, "Enabling translucent depth multipass for game %s", prod_id.c_str());