diff --git a/CHANGELOG b/CHANGELOG
index 4e2fcf35..3a8675bb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -80,6 +80,9 @@ HISTORY
 
  ++ Bugfixes:
 
+  2014-01-10: Simon Goldschmidt
+  * tcp.c: fixed bug #39898 tcp_fasttmr() possible lock due to infinte queue process loop
+
   2013-06-29: Simon Goldschmidt
   * inet.h, sockets.h: partially fixed bug #37585: IPv6 compatibility (in socket structs)
 
diff --git a/src/core/tcp.c b/src/core/tcp.c
index 8690cd24..65fc3c19 100644
--- a/src/core/tcp.c
+++ b/src/core/tcp.c
@@ -1112,6 +1112,8 @@ tcp_fasttmr_start:
         }
       }
       pcb = next;
+    } else {
+      pcb = pcb->next;
     }
   }
 }