diff --git a/src/components/@shared/Orbis/Comment/Posts.module.css b/src/components/@shared/Orbis/Comment/Posts.module.css
index 5eaaf21ed..b9d2499dc 100644
--- a/src/components/@shared/Orbis/Comment/Posts.module.css
+++ b/src/components/@shared/Orbis/Comment/Posts.module.css
@@ -16,3 +16,8 @@
   padding: calc(var(--spacer) / 2) var(--spacer);
   border-top: 1px solid var(--border-color);
 }
+
+.noComment {
+  padding: calc(var(--spacer) / 2) var(--spacer);
+  text-align: center;
+}
diff --git a/src/components/@shared/Orbis/Comment/Posts.tsx b/src/components/@shared/Orbis/Comment/Posts.tsx
index 77e8a715c..a5a9f7538 100644
--- a/src/components/@shared/Orbis/Comment/Posts.tsx
+++ b/src/components/@shared/Orbis/Comment/Posts.tsx
@@ -22,10 +22,14 @@ export default function Posts({
           posts.map((post, index) => <Post key={index} post={post} />)}
       </div>
 
-      {loading && (
+      {loading ? (
         <div className={styles.loader}>
           <Loader />
         </div>
+      ) : (
+        !posts.length && (
+          <div className={styles.noComment}>No comment yet...</div>
+        )
       )}
 
       {!loading && hasMore && (
diff --git a/src/components/@shared/Orbis/Comment/index.tsx b/src/components/@shared/Orbis/Comment/index.tsx
index c899e4315..e09e97aa0 100644
--- a/src/components/@shared/Orbis/Comment/index.tsx
+++ b/src/components/@shared/Orbis/Comment/index.tsx
@@ -22,7 +22,7 @@ export default function Comment({ asset }: { asset: AssetExtended }) {
     if (error) {
       console.log(error)
     }
-    if (data) {
+    if (data && data.length) {
       const newPosts = posts.concat(data)
       setPosts(newPosts)