diff --git a/models/profile.js b/models/profile.js
index 192a036..6f7f73c 100644
--- a/models/profile.js
+++ b/models/profile.js
@@ -216,7 +216,8 @@ module.exports = {
         }
 
         if (result) {
-          resolve(result.messages.id(messageId));
+          let message = result.messages.id(messageId);
+          resolve(message ? message : {});
         }
       });
 		});