diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 1bd8bc397..2b6cdb1f7 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -216,20 +216,18 @@
 	</div>
 </div>
 
-{% if not v or v.cardview %}
-	{% if p.is_image %}
-		<div style="text-align: center" class="mt-4">
-			<a target="_blank" rel="nofollow noopener noreferrer" href="{{p.url}}">
-				<img loading="lazy" src="{{p.url}}" class="img-fluid" style="max-height:500px;" alt="Unable to load image">
-			</a>
-		</div>
-	{% elif p.is_video %}
-		<div style="text-align: center" class="mt-4">
-			<video controls preload="metadata" style="max-width: 100%">
-				<source src="{{ p.realurl(v) }}" type="video/mp4">
-			</video>
-		</div>
-	{% endif %}
+{% if p.is_image and not (v and not v.cardview) %}
+	<div style="text-align: center" class="mt-4">
+		<a target="_blank" rel="nofollow noopener noreferrer" href="{{p.url}}">
+			<img loading="lazy" src="{{p.url}}" class="img-fluid" style="max-height:500px;" alt="Unable to load image">
+		</a>
+	</div>
+{% elif p.is_video %}
+	<div style="text-align: center" class="mt-4">
+		<video controls preload="metadata" style="max-width: 100%">
+			<source src="{{ p.realurl(v) }}" type="video/mp4">
+		</video>
+	</div>
 {% endif %}
 
 {% if p.realbody(v) %}