diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
index 37e35f0c0a..5b613ac2c7 100644
--- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
@@ -170,6 +170,9 @@ eng_output_free(void *data)
    Render_Engine *re;
 
    re = (Render_Engine *)data;
+   
+   if (re->xrdb) XrmDestroyDatabase(re->xrdb);
+   
    eng_window_free(re->win);
    free(re);
 
diff --git a/legacy/evas/src/modules/engines/software_x11/evas_engine.c b/legacy/evas/src/modules/engines/software_x11/evas_engine.c
index fa98684b36..0d42d333ae 100644
--- a/legacy/evas/src/modules/engines/software_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/software_x11/evas_engine.c
@@ -553,11 +553,12 @@ eng_output_free(void *data)
 
    if (!data) return;
 
+   re = (Render_Engine *)data;
+   
 #ifdef BUILD_ENGINE_SOFTWARE_XLIB
-   if (re->xrdb) XrmDestroyDatabase(re->xrdb);
+//   if (re->xrdb) XrmDestroyDatabase(re->xrdb);
 #endif   
    
-   re = (Render_Engine *)data;
    re->outbuf_free(re->ob);
    evas_common_tilebuf_free(re->tb);
    if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);