diff --git a/resolvers/reader.py b/resolvers/reader.py
index 035bdb4a..f46d180f 100644
--- a/resolvers/reader.py
+++ b/resolvers/reader.py
@@ -100,7 +100,17 @@ async def get_shout(_, _info, slug=None, shout_id=None):
                 for author in shout.authors:
                     if author.id == author_caption.author:
                         author.caption = author_caption.caption
-            shout.main_topic = session.query(Topic.slug).join(ShoutTopic, and_(ShoutTopic.topic == Topic.id, ShoutTopic.shout == shout.id, ShoutTopic.main == True)).first().pop()
+            main_topic = (
+                session.query(ShoutTopics.topic_slug)
+                .filter(
+                    ShoutTopics.shout_id == shout.id,
+                    ShoutTopics.main == True
+                )
+                .first()
+            )
+
+            if main_topic:
+                shout.main_topic = main_topic[0]
             return shout
         except Exception:
             raise HTTPException(status_code=404, detail=f"shout {slug or shout_id} not found")
@@ -159,7 +169,17 @@ async def load_shouts_by(_, _info, options):
     shouts = []
     with local_session() as session:
         for [shout, reacted_stat, commented_stat, rating_stat, _last_comment] in session.execute(q).unique():
-            shout.main_topic = session.query(Topic.slug).join(ShoutTopic, and_(ShoutTopic.topic == Topic.id, ShoutTopic.shout == shout.id, ShoutTopic.main == True)).first().pop()
+            main_topic = (
+                session.query(ShoutTopics.topic_slug)
+                .filter(
+                    ShoutTopics.shout_id == shout.id,
+                    ShoutTopics.main == True
+                )
+                .first()
+            )
+
+            if main_topic:
+                shout.main_topic = main_topic[0]
             shout.stat = {
                 "viewed": await ViewedStorage.get_shout(shout.slug),
                 "reacted": reacted_stat,
@@ -193,10 +213,17 @@ async def load_shouts_drafts(_, info):
             q = q.filter(Shout.created_by == reader.id)
             q = q.group_by(Shout.id)
             for [shout] in session.execute(q).unique():
-                shout.main_topic = session.query(ShoutTopics.topic_slug).filter(
+                main_topic = (
+                    session.query(ShoutTopics.topic_slug)
+                    .filter(
                         ShoutTopics.shout_id == shout.id,
                         ShoutTopics.main == True
-                    ).first().pop()
+                    )
+                    .first()
+                )
+
+                if main_topic:
+                    shout.main_topic = main_topic[0]
                 shouts.append(shout)
 
     return shouts
@@ -249,7 +276,17 @@ async def load_shouts_feed(_, info, options):
 
             shouts = []
             for [shout, reacted_stat, commented_stat, rating_stat, _last_comment] in session.execute(q).unique():
-                shout.main_topic = session.query(Topic.slug).join(ShoutTopic, and_(ShoutTopic.topic == Topic.id, ShoutTopic.shout == shout.id, ShoutTopic.main == True)).first().pop()
+                main_topic = (
+                    session.query(ShoutTopics.topic_slug)
+                    .filter(
+                        ShoutTopics.shout_id == shout.id,
+                        ShoutTopics.main == True
+                    )
+                    .first()
+                )
+
+                if main_topic:
+                    shout.main_topic = main_topic[0]
                 shout.stat = {
                     "viewed": await ViewedStorage.get_shout(shout.slug),
                     "reacted": reacted_stat,