diff --git a/gfx/gfx_display.c b/gfx/gfx_display.c
index 6db373f703..8a66573272 100644
--- a/gfx/gfx_display.c
+++ b/gfx/gfx_display.c
@@ -15,7 +15,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "gfx_display.h"
-#include "gfx_animation.h"
 
 #include "video_coord_array.h"
 #include "../configuration.h"
@@ -1786,7 +1785,6 @@ void gfx_display_free(void)
 {
    gfx_display_t           *p_disp   = disp_get_ptr();
    video_coord_array_free(&p_disp->dispca);
-   gfx_animation_ctl(MENU_ANIMATION_CTL_DEINIT, NULL);
 
    p_disp->msg_force           = false;
    p_disp->header_height       = 0;
diff --git a/retroarch.c b/retroarch.c
index 7c62b29f06..d327e60c12 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -7695,6 +7695,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
                memset(&system->info, 0, sizeof(struct retro_system_info));
             }
 
+            gfx_animation_ctl(MENU_ANIMATION_CTL_DEINIT, NULL);
             gfx_display_free();
 
             menu_entries_settings_deinit(p_rarch);