diff --git a/command.go b/command.go
index d9238eef..b05f82c8 100644
--- a/command.go
+++ b/command.go
@@ -1003,18 +1003,20 @@ func xMessageSliceParser(rd *proto.Reader, n int64) (interface{}, error) {
 				return nil, err
 			}
 
-			v, err := rd.ReadArrayReply(stringInterfaceMapParser)
-			if err != nil && err != proto.Nil {
-				return nil, err
-			}
+			var values map[string]interface{}
 
-			if v == nil || err == proto.Nil {
-				v = make(map[string]interface{})
+			v, err := rd.ReadArrayReply(stringInterfaceMapParser)
+			if err != nil {
+				if err != proto.Nil {
+					return nil, err
+				}
+			} else {
+				values = v.(map[string]interface{})
 			}
 
 			msgs[i] = XMessage{
 				ID:     id,
-				Values: v.(map[string]interface{}),
+				Values: values,
 			}
 			return nil, nil
 		})
diff --git a/commands_test.go b/commands_test.go
index 712817a8..e4fbf6a1 100644
--- a/commands_test.go
+++ b/commands_test.go
@@ -3638,7 +3638,7 @@ var _ = Describe("Commands", func() {
 					Stream: "stream",
 					Messages: []redis.XMessage{
 						{ID: "1-0", Values: map[string]interface{}{"uno": "un"}},
-						{ID: "2-0", Values: map[string]interface{}{}},
+						{ID: "2-0", Values: nil},
 						{ID: "3-0", Values: map[string]interface{}{"tres": "troix"}},
 					}},
 				}))