diff --git a/src/cpu/386_dynarec.c b/src/cpu/386_dynarec.c
index e132c0300..c96e3420d 100644
--- a/src/cpu/386_dynarec.c
+++ b/src/cpu/386_dynarec.c
@@ -48,6 +48,7 @@
 
 #define CPU_BLOCK_END() cpu_block_end = 1
 
+int cpu_override_dynarec    = 0;
 int inrecomp                = 0;
 int cpu_block_end           = 0;
 int cpu_end_block_after_ins = 0;
@@ -718,7 +719,7 @@ exec386_dynarec(int32_t cycs)
             cycles_old       = cycles;
             oldtsc           = tsc;
             tsc_old          = tsc;
-            if (!CACHE_ON()) /*Interpret block*/
+            if ((!CACHE_ON()) || cpu_override_dynarec) /*Interpret block*/
             {
                 exec386_dynarec_int();
             } else {
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index e185f2e4a..95625df55 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -833,6 +833,9 @@ extern void nmi_raise(void);
 extern MMX_REG  *MMP[8];
 extern uint16_t *MMEP[8];
 
+extern int  cpu_block_end;
+extern int  cpu_override_dynarec;
+
 extern void mmx_init(void);
 extern void prefetch_flush(void);
 
diff --git a/src/device/kbc_at.c b/src/device/kbc_at.c
index d2e6cf364..bc4a1f366 100644
--- a/src/device/kbc_at.c
+++ b/src/device/kbc_at.c
@@ -1787,6 +1787,9 @@ kbc_at_process_cmd(void *priv)
                 if (dev->ib == 0xbb)
                     break;
 
+                if (strstr(machine_get_internal_name(), "pb") != NULL)
+                    cpu_override_dynarec = 1;
+
                 if (dev->misc_flags & FLAG_PS2) {
                     set_enable_aux(dev, 1);
                     if ((dev->ports[1] != NULL) && (dev->ports[1]->priv != NULL)) {
@@ -1891,6 +1894,8 @@ kbc_at_read(uint16_t port, void *priv)
                      This also means that in AT mode, the IRQ is level-triggered. */
             if (!(dev->misc_flags & FLAG_PS2))
                 picintclevel(1 << 1, &dev->irq_state);
+            if ((strstr(machine_get_internal_name(), "pb") != NULL) && (cpu_override_dynarec == 1))
+                cpu_override_dynarec = 0;
             break;
 
         case 0x64:
diff --git a/src/device/mouse_ps2.c b/src/device/mouse_ps2.c
index 35f0cd9e8..c3a7310f0 100644
--- a/src/device/mouse_ps2.c
+++ b/src/device/mouse_ps2.c
@@ -21,6 +21,7 @@
 #include <wchar.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
+#include "cpu.h"
 #include <86box/device.h>
 #include <86box/keyboard.h>
 #include <86box/mouse.h>
@@ -276,6 +277,7 @@ ps2_write(void *priv)
                 break;
 
             default:
+                mouse_ps2_log("%s: Bad command: %02X\n", dev->name, val);
                 kbc_at_dev_queue_add(dev, 0xfe, 0);
         }
     }