diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 99ba1dd2f0..aa5e4e4f3c 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -355,13 +355,6 @@ ecore_shutdown(void)
           ERR("Init count not greater than 0 in shutdown.");
           return 0;
        }
-
-     // We need to flush all pending event as this is
-     // the only way to properly avoid use after free
-     // during shutdown of component that may have
-     // emitted and still pending event.
-     _ecore_event_call();
-
      if (_ecore_init_count-- != _ecore_init_count_threshold)
        goto end;
 
diff --git a/src/lib/ecore/ecore_events.c b/src/lib/ecore/ecore_events.c
index db24688d92..aa4bde56ed 100644
--- a/src/lib/ecore/ecore_events.c
+++ b/src/lib/ecore/ecore_events.c
@@ -605,3 +605,4 @@ _ecore_event_signal_realtime_new(void)
 {
    return calloc(1, sizeof(Ecore_Event_Signal_Realtime));
 }
+