diff --git a/lib/shared/thread-utils.js b/lib/shared/thread-utils.js
--- a/lib/shared/thread-utils.js
+++ b/lib/shared/thread-utils.js
@@ -1714,6 +1714,13 @@
           communityThreadIDForGenesisThreads[threadInfo.id] =
             lastThreadInTraversePath.id;
         }
+        if (
+          lastThreadInTraversePath.type !== threadTypes.PERSONAL &&
+          lastThreadInTraversePath.type !== threadTypes.PRIVATE
+        ) {
+          result[genesis.id][lastThreadInTraversePath.id] =
+            lastThreadInTraversePath;
+        }
       } else {
         if (
           !communityThreadIDForGenesisThreads[lastThreadInTraversePathParentID]