diff --git a/aos/linux_code/queue-tmpl.h b/aos/linux_code/queue-tmpl.h
index 719af5d..25eb8d9 100644
--- a/aos/linux_code/queue-tmpl.h
+++ b/aos/linux_code/queue-tmpl.h
@@ -108,7 +108,9 @@
 template <class T>
 aos::MessageBuilder<T> Queue<T>::MakeWithBuilder() {
   Init();
-  return aos::MessageBuilder<T>(queue_, MakeRawMessage());
+  T *const ret = MakeRawMessage();
+  ret->Zero();
+  return aos::MessageBuilder<T>(queue_, ret);
 }
 
 }  // namespace aos