From e3943eebba4a9b8120d1c22ef5ca2280dda52fe8 Mon Sep 17 00:00:00 2001
From: Sami Mazouz <sychocouldy@gmail.com>
Date: Sun, 5 Jan 2025 11:59:45 +0100
Subject: [PATCH] fix: discussion page renders before loading is finished
 (#4158)

---
 framework/core/js/src/forum/components/DiscussionPage.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/framework/core/js/src/forum/components/DiscussionPage.tsx b/framework/core/js/src/forum/components/DiscussionPage.tsx
index 15d687fabf..269711bf8b 100644
--- a/framework/core/js/src/forum/components/DiscussionPage.tsx
+++ b/framework/core/js/src/forum/components/DiscussionPage.tsx
@@ -84,6 +84,10 @@ export default class DiscussionPage<CustomAttrs extends IDiscussionPageAttrs = I
   }
 
   view() {
+    if (this.loading || !this.discussion) {
+      return <LoadingIndicator />;
+    }
+
     return (
       <PageStructure
         className="DiscussionPage"