diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp
index 7c507679..189b6fa6 100644
--- a/libretro/libretro.cpp
+++ b/libretro/libretro.cpp
@@ -575,6 +575,8 @@ void retro_set_controller_port_device(unsigned port, unsigned device)
                     log_cb(RETRO_LOG_ERROR, "Invalid device (%d).\n", device);
                 break;
         }
+        
+        S9xControlsSoftReset();
     }
     else if(device != RETRO_DEVICE_NONE)
         log_cb(RETRO_LOG_INFO, "Nonexistent Port (%d).\n", port);