diff --git a/src/models/Message.js b/src/models/Message.js
index f5e5b37..baebd14 100644
--- a/src/models/Message.js
+++ b/src/models/Message.js
@@ -63,7 +63,7 @@
   }
 
   static mapToMessageOrGapModels(rawArray) {
-    return rawArray.map(mog => {
+    return rawArray.filter(mog => mog !== undefined).map(mog => {
       if (mog[1]) return new MessageModel(mog[1]);
       if (mog[2]) return new GapModel(mog[2]);
     });