diff --git a/src/lib/ecore/efl_loop_fd.c b/src/lib/ecore/efl_loop_fd.c
index 8e4871d7c2..ab4e184dac 100644
--- a/src/lib/ecore/efl_loop_fd.c
+++ b/src/lib/ecore/efl_loop_fd.c
@@ -200,11 +200,11 @@ _efl_loop_fd_efl_object_parent_set(Eo *obj, Efl_Loop_Fd_Data *pd, Efl_Object *pa
 }
 
 static void
-_efl_loop_fd_efl_object_destructor(Eo *obj, Efl_Loop_Fd_Data *pd)
+_efl_loop_fd_efl_object_invalidate(Eo *obj, Efl_Loop_Fd_Data *pd)
 {
-   efl_destructor(efl_super(obj, MY_CLASS));
-
    ecore_main_fd_handler_del(pd->handler);
+
+   efl_invalidate(efl_super(obj, MY_CLASS));
 }
 
 #include "efl_loop_fd.eo.c"
diff --git a/src/lib/ecore/efl_loop_fd.eo b/src/lib/ecore/efl_loop_fd.eo
index 45512b3b15..472bdaf211 100644
--- a/src/lib/ecore/efl_loop_fd.eo
+++ b/src/lib/ecore/efl_loop_fd.eo
@@ -40,7 +40,7 @@ class Efl.Loop_Fd (Efl.Loop_Consumer)
    }
    implements {
       Efl.Object.constructor;
-      Efl.Object.destructor;
+      Efl.Object.invalidate;
       Efl.Object.parent { set; }
    }
 }