diff --git a/src/qt/qt_settingsmachine.cpp b/src/qt/qt_settingsmachine.cpp
index 6b021b288..475730db9 100644
--- a/src/qt/qt_settingsmachine.cpp
+++ b/src/qt/qt_settingsmachine.cpp
@@ -278,7 +278,7 @@ SettingsMachine::on_comboBoxSpeed_currentIndexChanged(int index)
         if (!(flags & CPU_SUPPORTS_DYNAREC)) {
             ui->checkBoxDynamicRecompiler->setChecked(false);
             ui->checkBoxDynamicRecompiler->setEnabled(false);
-        } else if (flags & CPU_REQUIRES_DYNAREC) {
+        } else if ((flags & CPU_REQUIRES_DYNAREC) && !cpu_override) {
             ui->checkBoxDynamicRecompiler->setChecked(true);
             ui->checkBoxDynamicRecompiler->setEnabled(false);
         } else {
diff --git a/src/win/win_settings.c b/src/win/win_settings.c
index adeefd8b4..bd539a1a8 100644
--- a/src/win/win_settings.c
+++ b/src/win/win_settings.c
@@ -748,7 +748,7 @@ win_settings_machine_recalc_cpu(HWND hdlg)
     cpu_flags = temp_cpu_f->cpus[temp_cpu].cpu_flags;
     if (!(cpu_flags & CPU_SUPPORTS_DYNAREC) && (cpu_flags & CPU_REQUIRES_DYNAREC))
         fatal("Attempting to select a CPU that requires the recompiler and does not support it at the same time\n");
-    if (!(cpu_flags & CPU_SUPPORTS_DYNAREC) || (cpu_flags & CPU_REQUIRES_DYNAREC)) {
+    if (!(cpu_flags & CPU_SUPPORTS_DYNAREC) || ((cpu_flags & CPU_REQUIRES_DYNAREC) && !cpu_override))) {
         if (!(cpu_flags & CPU_SUPPORTS_DYNAREC))
             temp_dynarec = 0;
         if (cpu_flags & CPU_REQUIRES_DYNAREC)