diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index c339a0b264..72fb4eda9b 100644
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -228,7 +228,11 @@ void StreamTcpSessionClear(void *ssnptr)
 
     StreamTcpSessionCleanup(ssn);
 
+    /* HACK: don't loose track of thread id */
+    PoolThreadReserved a = ssn->res;
     memset(ssn, 0, sizeof(TcpSession));
+    ssn->res = a;
+
     PoolThreadReturn(ssn_pool, ssn);
 #ifdef DEBUG
     SCMutexLock(&ssn_pool_mutex);