diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 4c2dca4a2..afb1141d8 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -850,6 +850,8 @@ _e_comp_free(E_Comp *c)
    E_FREE_LIST(c->zones, e_object_del);
 
    e_comp_canvas_clear();
+
+   e_randr2_shutdown();
 #ifdef HAVE_WAYLAND
    if (c->comp_type == E_PIXMAP_TYPE_WL)
      e_comp_wl_shutdown();
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 03df29a78..10883a96c 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -5666,7 +5666,6 @@ e_comp_x_shutdown(void)
      ecore_x_screensaver_custom_blanking_disable();
    if (x_fatal) return;
    e_atoms_shutdown();
-   e_randr2_shutdown();
    /* ecore_x_ungrab(); */
    ecore_x_focus_reset();
    ecore_x_events_allow_all();