diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index 6a4a21356df..90f320ca7dd 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -277,6 +277,7 @@
       cursor: default;
       video {
         max-width: 100%;
+        max-height: 500px;
         height: auto;
       }
       audio {
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index d8099b945ba..6b5345d99de 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -510,6 +510,10 @@ iframe {
   max-width: 100%;
 }
 
+video {
+  max-height: 500px;
+}
+
 @keyframes fadein {
     from {opacity: 0;}
     to {opacity: 1;}