diff --git a/src/lib/emotion/emotion_modules.c b/src/lib/emotion/emotion_modules.c
index 95d6a8b30c..dffc6fd33b 100644
--- a/src/lib/emotion/emotion_modules.c
+++ b/src/lib/emotion/emotion_modules.c
@@ -146,9 +146,6 @@ emotion_modules_shutdown(void)
 {
    Emotion_Engine_Registry_Entry *re;
 
-   EINA_LIST_FREE(_emotion_engine_registry, re)
-     _emotion_engine_registry_entry_free(re);
-
 #ifdef EMOTION_STATIC_BUILD_XINE
    xine_module_shutdown();
 #endif
@@ -166,6 +163,12 @@ emotion_modules_shutdown(void)
         _emotion_modules = NULL;
      }
 
+   EINA_LIST_FREE(_emotion_engine_registry, re)
+     {
+        WRN("Engine was not unregistered: %p", re->engine);
+        _emotion_engine_registry_entry_free(re);
+     }
+
    _emotion_modules_loaded = EINA_FALSE;
 }