diff --git a/zephyr/models.py b/zephyr/models.py
index 86cb16f031..22e266ffe5 100644
--- a/zephyr/models.py
+++ b/zephyr/models.py
@@ -69,9 +69,9 @@ class UserProfile(models.Model):
     def add_callback(self, cb, last_received):
         global callback_table
 
-        new_zephyrs = [um.message for um in
-                       UserMessage.objects.filter(user_profile=self,
-                                                  message__id__gt=last_received)]
+        new_zephyrs = Zephyr.objects.filter(
+            usermessage__user_profile = self,
+            id__gt = last_received)
 
         if new_zephyrs:
             return cb(new_zephyrs)