diff --git a/app/src/main/java/com/h/pixeldroid/objects/Status.kt b/app/src/main/java/com/h/pixeldroid/objects/Status.kt
index af6db54f..7f261196 100644
--- a/app/src/main/java/com/h/pixeldroid/objects/Status.kt
+++ b/app/src/main/java/com/h/pixeldroid/objects/Status.kt
@@ -179,7 +179,6 @@ data class Status(
         nshares.setTypeface(null, Typeface.BOLD)
 
         //Setup images
-        setupPostPics(rootView, request, homeFragment)
         ImageConverter.setRoundImageFromURL(
             rootView,
             this.getProfilePicUrl(),
@@ -187,6 +186,12 @@ data class Status(
         )
         rootView.profilePic.setOnClickListener { account.openProfile(rootView.context) }
 
+        //Setup post pic only if there are media attachments
+        if(!media_attachments.isNullOrEmpty()) {
+            setupPostPics(rootView, request, homeFragment)
+        }
+
+
         //Set comment initial visibility
         rootView.findViewById<LinearLayout>(R.id.commentIn).visibility = View.GONE
     }