diff --git a/dap-sdk/net/core/dap_proc_thread.c b/dap-sdk/net/core/dap_proc_thread.c
index dcb689326bea7e0b54d155c7da7d563df68cc6e5..c3e1b3a9b719e8ef9f69a32785da2dfa3d24639e 100644
--- a/dap-sdk/net/core/dap_proc_thread.c
+++ b/dap-sdk/net/core/dap_proc_thread.c
@@ -451,18 +451,6 @@ static void * s_proc_thread_function(void * a_arg)
         return NULL;
     }
 	
-    // Add exit event
-    l_thread->event_exit->ev.events     = l_thread->event_exit->ev_base_flags;
-    l_thread->event_exit->ev.data.ptr   = l_thread->event_exit;
-    if( epoll_ctl(l_thread->epoll_ctl, EPOLL_CTL_ADD, l_thread->event_exit->socket , &l_thread->event_exit->ev) != 0 ){
-#ifdef DAP_OS_WINDOWS
-        errno = WSAGetLastError();
-#endif
-        log_it(L_CRITICAL, "Can't add exit event on epoll ctl, err: %d", errno);
-        return NULL;
-    }
-
-
     // Add exit event
     l_thread->event_exit->ev.events     = l_thread->event_exit->ev_base_flags;
     l_thread->event_exit->ev.data.ptr   = l_thread->event_exit;
@@ -524,13 +512,6 @@ static void * s_proc_thread_function(void * a_arg)
     l_thread->esockets[l_thread->poll_count] = l_thread->proc_event;
     l_thread->poll_count++;
 	
-    // Add exit event
-    l_thread->poll[l_thread->poll_count].fd = l_thread->event_exit->fd;
-    l_thread->poll[l_thread->poll_count].events = l_thread->event_exit->poll_base_flags;
-    l_thread->esockets[l_thread->poll_count] = l_thread->event_exit;
-    l_thread->poll_count++;
-
-
     // Add exit event
     l_thread->poll[l_thread->poll_count].fd = l_thread->event_exit->fd;
     l_thread->poll[l_thread->poll_count].events = l_thread->event_exit->poll_base_flags;