diff --git a/libtrap/src/ifc_tcpip.c b/libtrap/src/ifc_tcpip.c
index b0bcca31..71c1178e 100644
--- a/libtrap/src/ifc_tcpip.c
+++ b/libtrap/src/ifc_tcpip.c
@@ -1213,8 +1213,6 @@ send_blocking_mode(void *arg)
       __sync_add_and_fetch(&cl->container_id, 1);
    }
 
-   pthread_exit(NULL);
-
 cleanup:
    disconnect_client(c, cl);
    free(arg);
@@ -1314,8 +1312,6 @@ send_non_blocking_mode(void *arg)
       }
    }
 
-   pthread_exit(NULL);
-
 cleanup:
    disconnect_client(c, cl);
    free(arg);
diff --git a/libtrap/src/ifc_tls.c b/libtrap/src/ifc_tls.c
index 4a2a2a56..b2708960 100644
--- a/libtrap/src/ifc_tls.c
+++ b/libtrap/src/ifc_tls.c
@@ -1351,8 +1351,6 @@ send_blocking_mode(void *arg)
       __sync_add_and_fetch(&cl->container_id, 1);
    }
 
-   pthread_exit(NULL);
-
 cleanup:
    disconnect_client(c, cl);
    free(arg);
@@ -1449,8 +1447,6 @@ send_non_blocking_mode(void *arg)
       }
    }
 
-   pthread_exit(NULL);
-
 cleanup:
    disconnect_client(c, cl);
    free(arg);