diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index f311ecbdf..72652b64f 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -217,9 +217,6 @@ e_comp_wl_init(void)
    if (!(_e_wl_comp = E_NEW(E_Wayland_Compositor, 1)))
      return EINA_FALSE;
 
-   if (!getenv("XDG_RUNTIME_DIR"))
-     e_util_env_set("XDG_RUNTIME_DIR", "/tmp");
-
    /* try to create a wayland display */
    if (!(_e_wl_comp->wl.display = wl_display_create()))
      {
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index fe6f2ca34..1a71aa798 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -149,6 +149,9 @@ _xdg_data_dirs_augment(void)
         snprintf(buf, sizeof(buf), "%s:/usr/local/share:/usr/share", newpath);
         e_util_env_set("XDG_DATA_DIRS", buf);
      }
+
+   if (!getenv("XDG_RUNTIME_DIR"))
+     e_util_env_set("XDG_RUNTIME_DIR", "/tmp");
 }
 
 static void