diff --git a/src/frontend-common/common_host_interface.cpp b/src/frontend-common/common_host_interface.cpp
index 12b6463ea..b1fbe1fcc 100644
--- a/src/frontend-common/common_host_interface.cpp
+++ b/src/frontend-common/common_host_interface.cpp
@@ -3891,6 +3891,8 @@ void CommonHostInterface::SetCheatCodeState(u32 index, bool enabled, bool save_t
     return;
 
   cc.enabled = enabled;
+  if (!enabled)
+    cc.ApplyOnDisable();
 
   if (enabled)
   {