diff --git a/cheat_manager.c b/cheat_manager.c
index 741c30532c..9bb7314910 100644
--- a/cheat_manager.c
+++ b/cheat_manager.c
@@ -108,7 +108,7 @@ void cheat_manager_apply_cheats(void)
       RARCH_LOG("%s\n", msg_hash_to_str(MSG_APPLYING_CHEAT));
    }
 
-#ifdef HAVE_CHEEVOS
+#if 0
    if (idx != 0 && rcheevos_hardcore_active())
       cheat_manager_pause_cheevos();
 #endif
@@ -1578,7 +1578,7 @@ void cheat_manager_apply_retro_cheats(void)
       }
    }
 
-#ifdef HAVE_CHEEVOS
+#if 0
    if (cheat_applied && rcheevos_hardcore_active())
       cheat_manager_pause_cheevos();
 #endif
diff --git a/command.c b/command.c
index bca4379177..33796d3e6f 100644
--- a/command.c
+++ b/command.c
@@ -71,7 +71,7 @@
 
 static void command_post_state_loaded(void)
 {
-#ifdef HAVE_CHEEVOS
+#if 0
    if (rcheevos_hardcore_active())
    {
       rcheevos_pause_hardcore();
@@ -802,11 +802,13 @@ bool command_write_ram(command_t *cmd, const char *arg)
    if (!data)
       return false;
 
+#if 0
    if (rcheevos_hardcore_active())
    {
       RARCH_LOG("[Command]: Achievements hardcore mode disabled by WRITE_CORE_RAM.\n");
       rcheevos_pause_hardcore();
    }
+#endif
 
    while (*arg)
    {
@@ -1014,7 +1016,7 @@ bool command_write_memory(command_t *cmd, const char *arg)
       snprintf(reply_at, sizeof(reply) - strlen(reply) - 1,
             " %u\n", (unsigned)(data - start));
 
-#ifdef HAVE_CHEEVOS
+#if 0
       if (rcheevos_hardcore_active())
       {
          RARCH_LOG("[Command]: Achievements hardcore mode disabled by WRITE_CORE_MEMORY.\n");
@@ -1327,7 +1329,7 @@ bool command_event_load_entry_state(settings_t *settings)
    if (!core_info_current_supports_savestate())
       return false;
 
-#ifdef HAVE_CHEEVOS
+#if 0
    if (rcheevos_hardcore_active())
       return false;
 #endif
@@ -1374,7 +1376,7 @@ void command_event_load_auto_state(void)
    if (!core_info_current_supports_savestate())
       return;
 
-#ifdef HAVE_CHEEVOS
+#if 0
    if (rcheevos_hardcore_active())
       return;
 #endif
diff --git a/retroarch.c b/retroarch.c
index 7fd84d5516..c9afee39a4 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -3420,7 +3420,7 @@ bool command_event(enum event_command cmd, void *data)
 #endif
       case CMD_EVENT_LOAD_STATE:
          {
-#ifdef HAVE_CHEEVOS
+#if 0
             if (rcheevos_hardcore_active())
             {
                runloop_msg_queue_push(msg_hash_to_str(MSG_CHEEVOS_LOAD_STATE_PREVENTED_BY_HARDCORE_MODE), 0, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_WARNING);
@@ -3805,7 +3805,7 @@ bool command_event(enum event_command cmd, void *data)
 
             if (core_type_is_dummy)
                return false;
-#ifdef HAVE_CHEEVOS
+#if 0
             if (rcheevos_hardcore_active())
                return false;
 #endif
diff --git a/tasks/task_save.c b/tasks/task_save.c
index b7c42163cb..b13c453edb 100644
--- a/tasks/task_save.c
+++ b/tasks/task_save.c
@@ -721,7 +721,7 @@ static void task_load_handler(retro_task_t *task)
          goto end;
    }
 
-#ifdef HAVE_CHEEVOS
+#if 0
    if (rcheevos_hardcore_active())
       task_set_cancelled(task, true);
 #endif
@@ -988,7 +988,7 @@ static void content_load_state_cb(retro_task_t *task,
    bool block_sram_overwrite   = settings->bools.block_sram_overwrite;
    struct string_list *savefile_list = (struct string_list*)savefile_ptr_get();
 
-#ifdef HAVE_CHEEVOS
+#if 0
    if (rcheevos_hardcore_active())
       goto error;
 #endif