diff --git a/models/profile.js b/models/profile.js
index ca163ec..ab7e932 100644
--- a/models/profile.js
+++ b/models/profile.js
@@ -169,7 +169,7 @@ module.exports = {
 	allMessageImages: (e, profileId) => {
 		const promise = new Promise((resolve, reject) => {	
 			ProfileModel
-				.find({ _id: profileId, $or: [{ 'messages.image': { $exists: true } }, { 'messages.image': { $ne: null } }] })
+				.find({ _id: profileId, messages: { $elemMatch: { image: { $exists: true, $ne: null } } } })
 				.select('messages.image')
 				.exec((err, result) => {
 					if (err) {