diff --git a/repos/os/include/trace/trace_buffer.h b/repos/os/include/trace/trace_buffer.h
index 513fbed94c..cfc6dab8d8 100644
--- a/repos/os/include/trace/trace_buffer.h
+++ b/repos/os/include/trace/trace_buffer.h
@@ -79,8 +79,14 @@ class Trace_buffer
 				if (wrapped && entry.last()) {
 					wrapped = false;
 					entry = _buffer.first();
-					if (entry.last())
+					if (entry.last()) {
+						new_curr = entry;
 						break;
+					}
+				}
+
+				if (!entry.length()) {
+					continue;
 				}
 
 				if (!functor(entry))