diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c
index c2ee0f5980..b4cca117ca 100644
--- a/managers/cheat_manager.c
+++ b/managers/cheat_manager.c
@@ -88,8 +88,11 @@ void cheat_manager_apply_cheats(void)
             core_set_cheat(&cheat_info);
       }
    }
-    runloop_msg_queue_push(msg_hash_to_str(MSG_APPLYING_CHEAT), 1, 180, true);
-    RARCH_LOG("%s\n", msg_hash_to_str(MSG_APPLYING_CHEAT));
+
+   if ( cheat_manager_state.size > 0 ) {
+      runloop_msg_queue_push(msg_hash_to_str(MSG_APPLYING_CHEAT), 1, 180, true);
+      RARCH_LOG("%s\n", msg_hash_to_str(MSG_APPLYING_CHEAT));
+   }
 
 #ifdef HAVE_CHEEVOS
    data_bool = idx != 0;