diff --git a/app/assets/stylesheets/comments.css b/app/assets/stylesheets/comments.css
index 8f9b26172..18f1aba84 100644
--- a/app/assets/stylesheets/comments.css
+++ b/app/assets/stylesheets/comments.css
@@ -61,6 +61,18 @@
         margin-block-end: 0;
       }
     }
+
+    img,
+    video,
+    embed,
+    object {
+      max-block-size: 32rem;
+
+      /* Links should hug media contained within */
+      a:has(&) {
+        display: inline-block;
+      }
+    }
   }
 
   .comment__content {