diff --git a/src/lib/eina/eina_debug.c b/src/lib/eina/eina_debug.c
index dcd707899d..2b4c25588b 100644
--- a/src/lib/eina/eina_debug.c
+++ b/src/lib/eina/eina_debug.c
@@ -514,8 +514,6 @@ _session_create(int fd)
    session->fd = fd;
    // start the monitor thread
    _thread_start(session);
-   _daemon_greet(session);
-   _opcodes_register_all(session);
    return session;
 }
 
@@ -610,6 +608,9 @@ _monitor(void *_data)
 #ifndef _WIN32
    Eina_Debug_Session *session = _data;
 
+   _daemon_greet(session);
+   _opcodes_register_all(session);
+
    // set a name for this thread for system debugging
 #ifdef EINA_HAVE_PTHREAD_SETNAME
 # ifndef __linux__