diff --git a/src/bin/edi_debugpanel.c b/src/bin/edi_debugpanel.c
index fd3331c..5b491ca 100644
--- a/src/bin/edi_debugpanel.c
+++ b/src/bin/edi_debugpanel.c
@@ -324,7 +324,7 @@ _edi_debug_active_check_cb(void *data EINA_UNUSED)
 
    if (pid == -1)
      {
-        if (_debug_exe) ecore_exe_free(_debug_exe);
+        if (_debug_exe) ecore_exe_quit(_debug_exe);
         _debug_exe = NULL;
         elm_object_disabled_set(_button_quit, EINA_TRUE);
         elm_object_disabled_set(_button_start, EINA_FALSE);
@@ -351,8 +351,6 @@ void edi_debugpanel_stop(void)
    if (pid != -1)
      ecore_exe_quit(_debug_exe);
 
-   if (_debug_exe) ecore_exe_free(_debug_exe);
-
    _debug_exe = NULL;
 
    elm_object_disabled_set(_button_quit, EINA_TRUE);
diff --git a/src/lib/edi_exe.c b/src/lib/edi_exe.c
index 50bb800..2e5baf5 100644
--- a/src/lib/edi_exe.c
+++ b/src/lib/edi_exe.c
@@ -25,10 +25,6 @@ edi_exe_wait(const char *command)
    ecore_thread_main_loop_end();
 
    waitpid(pid, &exit, 0);
-
-   ecore_thread_main_loop_begin();
-   ecore_exe_free(exe);
-   ecore_thread_main_loop_end();
    return exit;
 }