diff --git a/kepi/trilby_api/tests/test_timelines.py b/kepi/trilby_api/tests/test_timelines.py
index 8199ee3..68e3732 100644
--- a/kepi/trilby_api/tests/test_timelines.py
+++ b/kepi/trilby_api/tests/test_timelines.py
@@ -45,7 +45,7 @@ class PublicTimeline(TestCase):
 
         self.assertEqual(len(response), 1)
         self.assertEqual(response[0]['content'],
-                '<p>Hello world.</p>',
+                'Hello world.',
                 )
 
     def test_public_singleton_direct(self):
diff --git a/kepi/trilby_api/views.py b/kepi/trilby_api/views.py
index b703a7e..cd4b965 100644
--- a/kepi/trilby_api/views.py
+++ b/kepi/trilby_api/views.py
@@ -362,17 +362,9 @@ class PublicTimeline(AbstractTimeline):
 
     def get_queryset(self, request):
 
-        result = []
-
-        timeline = trilby_models.Status.objects.all()
-
-        for item in timeline:
-
-            if item.visibility=='public':
-                result.append(item)
-
-            if len(result)>=PUBLIC_TIMELINE_SLICE_LENGTH:
-                break
+        result = trilby_models.Status.objects.filter(
+                visibility = Status.PUBLIC,
+                )[:PUBLIC_TIMELINE_SLICE_LENGTH]
 
         return result