diff --git a/src/Ryujinx.HLE/HLEConfiguration.cs b/src/Ryujinx.HLE/HLEConfiguration.cs
index 8e6ad570c..8ac76508f 100644
--- a/src/Ryujinx.HLE/HLEConfiguration.cs
+++ b/src/Ryujinx.HLE/HLEConfiguration.cs
@@ -103,11 +103,6 @@ namespace Ryujinx.HLE
         /// </summary>
         internal readonly bool EnablePtc;
 
-        /// <summary>
-        /// The amount of cpu threads that should be used for emulation.
-        /// </summary>
-        internal readonly int CpuCoresCount;
-
         /// <summary>
         /// Control if the guest application should be told that there is a Internet connection available.
         /// </summary>
@@ -213,7 +208,6 @@ namespace Ryujinx.HLE
                                 VSyncMode vSyncMode,
                                 bool enableDockedMode,
                                 bool enablePtc,
-                                int cpuCoresCount,
                                 bool enableInternetAccess,
                                 IntegrityCheckLevel fsIntegrityCheckLevel,
                                 int fsGlobalAccessLogMode,
@@ -247,7 +241,6 @@ namespace Ryujinx.HLE
             CustomVSyncInterval = customVSyncInterval;
             EnableDockedMode = enableDockedMode;
             EnablePtc = enablePtc;
-            CpuCoresCount = cpuCoresCount;
             EnableInternetAccess = enableInternetAccess;
             FsIntegrityCheckLevel = fsIntegrityCheckLevel;
             FsGlobalAccessLogMode = fsGlobalAccessLogMode;
diff --git a/src/Ryujinx.HLE/HOS/Horizon.cs b/src/Ryujinx.HLE/HOS/Horizon.cs
index b56e5cc1d..aed65dea9 100644
--- a/src/Ryujinx.HLE/HOS/Horizon.cs
+++ b/src/Ryujinx.HLE/HOS/Horizon.cs
@@ -123,7 +123,7 @@ namespace Ryujinx.HLE.HOS
                 device.Memory,
                 device.Configuration.MemoryConfiguration.ToKernelMemorySize(),
                 device.Configuration.MemoryConfiguration.ToKernelMemoryArrange(),
-                device.Configuration.CpuCoresCount);
+                device.CpuCoresCount);
 
             Device = device;
 
diff --git a/src/Ryujinx.HLE/Switch.cs b/src/Ryujinx.HLE/Switch.cs
index 25e65354f..e15fab03a 100644
--- a/src/Ryujinx.HLE/Switch.cs
+++ b/src/Ryujinx.HLE/Switch.cs
@@ -32,6 +32,8 @@ namespace Ryujinx.HLE
         public TamperMachine TamperMachine { get; }
         public IHostUIHandler UIHandler { get; }
 
+        public int CpuCoresCount = 4; //Switch 1 has 4 cores
+
         public VSyncMode VSyncMode { get; set; } = VSyncMode.Switch;
         public bool CustomVSyncIntervalEnabled { get; set; } = false;
         public int CustomVSyncInterval { get; set; }
diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs
index e3bb3b338..a35a79e86 100644
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -918,7 +918,6 @@ namespace Ryujinx.Ava
 
             // Initialize Configuration.
             var memoryConfiguration = ConfigurationState.Instance.System.DramSize.Value;
-            int cpuCoresCount = 4; //Switch 1 has 4 cores
 
             Device = new Switch(new HLEConfiguration(
                 VirtualFileSystem,
@@ -935,7 +934,6 @@ namespace Ryujinx.Ava
                 ConfigurationState.Instance.Graphics.VSyncMode,
                 ConfigurationState.Instance.System.EnableDockedMode,
                 ConfigurationState.Instance.System.EnablePtc,
-                cpuCoresCount,
                 ConfigurationState.Instance.System.EnableInternetAccess,
                 ConfigurationState.Instance.System.EnableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
                 ConfigurationState.Instance.System.FsGlobalAccessLogMode,
diff --git a/src/Ryujinx/Headless/HeadlessRyujinx.Init.cs b/src/Ryujinx/Headless/HeadlessRyujinx.Init.cs
index 5c6a518a8..7d75ac7c1 100644
--- a/src/Ryujinx/Headless/HeadlessRyujinx.Init.cs
+++ b/src/Ryujinx/Headless/HeadlessRyujinx.Init.cs
@@ -329,8 +329,6 @@ namespace Ryujinx.Headless
                 renderer = new ThreadedRenderer(renderer);
             }
 
-            int cpuCoresCount = 4; //Switch 1 has 4 cores
-
             HLEConfiguration configuration = new(_virtualFileSystem,
                 _libHacHorizonManager,
                 _contentManager,
@@ -345,7 +343,6 @@ namespace Ryujinx.Headless
                 options.VSyncMode,
                 !options.DisableDockedMode,
                 !options.DisablePTC,
-                cpuCoresCount,
                 options.EnableInternetAccess,
                 !options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
                 options.FsGlobalAccessLogMode,