diff --git a/boards/forms.py b/boards/forms.py
--- a/boards/forms.py
+++ b/boards/forms.py
@@ -180,6 +180,10 @@ class PostForm(NeboardForm):
     def _validate_posting_speed(self):
         can_post = True
 
+        # TODO Remove this, it's only for test
+        if not 'user_id' in self.session:
+            return
+
         user = User.objects.get(id=self.session['user_id'])
         if user.is_veteran():
             posting_delay = VETERAN_POSTING_DELAY
diff --git a/boards/models/post.py b/boards/models/post.py
--- a/boards/models/post.py
+++ b/boards/models/post.py
@@ -427,7 +427,9 @@ class Thread(models.Model):
         Gets sorted thread posts
         """
 
-        return self.replies.all().order_by('pub_time')
+        # return self.replies.all().order_by('pub_time')
+        return self.replies.all().order_by('pub_time').prefetch_related(
+            'referenced_posts')
 
     def add_tag(self, tag):
         """
diff --git a/boards/templates/boards/post.html b/boards/templates/boards/post.html
--- a/boards/templates/boards/post.html
+++ b/boards/templates/boards/post.html
@@ -68,7 +68,7 @@
                     {{ post.text.rendered }}
                 {% endif %}
             {% endautoescape %}
-            {% with refposts=post.get_sorted_referenced_posts %}
+            {% with refposts=post.referenced_posts.all %}
                 {% if refposts %}
                     <div class="refmap">
                         {% trans "Replies" %}: