diff --git a/metadata/extra.go b/metadata/extra.go
index c7f7953..bdaa81f 100644
--- a/metadata/extra.go
+++ b/metadata/extra.go
@@ -145,6 +145,11 @@ func (em *ExtraMetadata) DecodeMsgpack(dec *msgpack.Decoder) error {
 			return err
 		}
 	}
+
+	if mapLen == 0 {
+		em.Data = make(map[int]interface{})
+	}
+
 	return nil
 }