diff --git a/FEXCore/Source/Interface/Config/Config.json.in b/FEXCore/Source/Interface/Config/Config.json.in
index 32c3406b1..967960b5c 100644
--- a/FEXCore/Source/Interface/Config/Config.json.in
+++ b/FEXCore/Source/Interface/Config/Config.json.in
@@ -395,14 +395,6 @@
           "This is required to ensure a split-lock doesn't tear inside the process"
         ]
       },
-      "TSOAutoMigration": {
-        "Type": "bool",
-        "Default": "true",
-        "Desc": [
-          "Automatically enables TSO when shared memory is used.",
-          "Should work without issues in most cases."
-        ]
-      },
       "VolatileMetadata": {
         "Type": "bool",
         "Default": "true",
diff --git a/Source/Tools/CodeSizeValidation/Main.cpp b/Source/Tools/CodeSizeValidation/Main.cpp
index 8831af3c7..f751a590e 100644
--- a/Source/Tools/CodeSizeValidation/Main.cpp
+++ b/Source/Tools/CodeSizeValidation/Main.cpp
@@ -509,6 +509,8 @@ int main(int argc, char** argv, char** const envp) {
   // Disable vixl simulator indirect calls as it can affect instruction counts.
   FEXCore::Config::Set(FEXCore::Config::CONFIG_DISABLE_VIXL_INDIRECT_RUNTIME_CALLS, "1");
 
+  FEXCore::Config::Set(FEXCore::Config::CONFIG_TSOENABLED, "0");
+
   // Host feature override. Only supports overriding SVE width.
   enum HostFeatures {
     FEATURE_SVE128 = (1U << 0),
@@ -580,11 +582,12 @@ int main(int argc, char** argv, char** const envp) {
   }
 
   if (TestHeaderData->EnabledHostFeatures & FEATURE_TSO) {
-    // Always disable auto migration.
-    FEXCore::Config::Set(FEXCore::Config::ConfigOption::CONFIG_TSOAUTOMIGRATION, "0");
     FEXCore::Config::Set(FEXCore::Config::ConfigOption::CONFIG_TSOENABLED, "1");
     FEXCore::Config::Set(FEXCore::Config::ConfigOption::CONFIG_VECTORTSOENABLED, "1");
     FEXCore::Config::Set(FEXCore::Config::ConfigOption::CONFIG_MEMCPYSETTSOENABLED, "1");
+  } else {
+    // Override the TSO default setting, since TSO is not relevant for most tests
+    FEXCore::Config::Set(FEXCore::Config::ConfigOption::CONFIG_TSOENABLED, "0");
   }
 
   // Always enable ARMv8.1 LSE atomics.
@@ -634,8 +637,6 @@ int main(int argc, char** argv, char** const envp) {
   }
 
   if (TestHeaderData->DisabledHostFeatures & FEATURE_TSO) {
-    // Always disable auto migration.
-    FEXCore::Config::Set(FEXCore::Config::ConfigOption::CONFIG_TSOAUTOMIGRATION, "0");
     FEXCore::Config::Set(FEXCore::Config::ConfigOption::CONFIG_TSOENABLED, "0");
     FEXCore::Config::Set(FEXCore::Config::ConfigOption::CONFIG_VECTORTSOENABLED, "0");
     FEXCore::Config::Set(FEXCore::Config::ConfigOption::CONFIG_MEMCPYSETTSOENABLED, "0");