diff --git a/base/include/base/trace/buffer.h b/base/include/base/trace/buffer.h
index a11bbb76e..baf05f961 100644
--- a/base/include/base/trace/buffer.h
+++ b/base/include/base/trace/buffer.h
@@ -76,6 +76,10 @@ class Genode::Trace::Buffer
 
 		void commit(size_t len)
 		{
+			/* omit empty entries */
+			if (len == 0)
+				return;
+
 			_head_entry()->len = len;
 
 			/* advance head offset, wrap when reaching buffer boundary */