diff --git a/app/static/structure.css b/app/static/structure.css
index 55609e4a..ec7d61e8 100644
--- a/app/static/structure.css
+++ b/app/static/structure.css
@@ -825,6 +825,7 @@ fieldset legend {
 
 .post_image img {
   max-width: 100%;
+  max-height: 90vh;
 }
 
 .render_username {
diff --git a/app/static/structure.scss b/app/static/structure.scss
index 4db49593..2de3d98e 100644
--- a/app/static/structure.scss
+++ b/app/static/structure.scss
@@ -459,6 +459,7 @@ html {
 .post_image {
   img {
     max-width: 100%;
+    max-height: 90vh;
   }
 }
 
diff --git a/app/templates/post/_post_full.html b/app/templates/post/_post_full.html
index 87828550..18ccccd8 100644
--- a/app/templates/post/_post_full.html
+++ b/app/templates/post/_post_full.html
@@ -32,11 +32,10 @@
             <div class="post_image">
                 {% if post.image_id %}
                     {% if low_bandwidth %}
-                        <a href="{{ post.image.view_url() }}" rel="nofollow ugc"><img src="{{ post.image.thumbnail_url() }}" alt="{{ post.image.alt_text if post.image.alt_text else post.title }}"
-                             width="{{ post.image.width }}" height="{{ post.image.height }}" /></a>
-                    {% else %}
                         <a href="{{ post.image.view_url() }}" rel="nofollow ugc"><img src="{{ post.image.medium_url() }}" alt="{{ post.image.alt_text if post.image.alt_text else post.title }}"
                              width="{{ post.image.width }}" height="{{ post.image.height }}" /></a>
+                    {% else %}
+                        <a href="{{ post.image.view_url() }}" rel="nofollow ugc"><img src="{{ post.image.view_url() }}" alt="{{ post.image.alt_text if post.image.alt_text else post.title }}"></a>
                     {% endif %}
                 {% else %}
                     <a href="{{ post.url }}" rel="nofollow ugc" target="_blank" aria-label="Go to image"><img src="{{ post.url }}" style="max-width: 100%; height: auto;"  /></a>