diff --git a/wireshark_gen/templates/_oftype_readers.lua b/wireshark_gen/templates/_oftype_readers.lua
index d21d03a..52a66e3 100644
--- a/wireshark_gen/templates/_oftype_readers.lua
+++ b/wireshark_gen/templates/_oftype_readers.lua
@@ -46,7 +46,9 @@
 end
 
 function read_of_octets_t(reader, version, subtree, field_name)
-    subtree:add(fields[field_name], reader.read_all())
+    if not reader.is_empty() then
+        subtree:add(fields[field_name], reader.read_all())
+    end
 end
 
 function read_list_of_hello_elem_t(reader, version, subtree, field_name)