diff --git a/packages/rocketchat-oembed/client/oembedImageWidget.html b/packages/rocketchat-oembed/client/oembedImageWidget.html
index b0b4e5ec49e..8d277d96502 100644
--- a/packages/rocketchat-oembed/client/oembedImageWidget.html
+++ b/packages/rocketchat-oembed/client/oembedImageWidget.html
@@ -1,10 +1,14 @@
 <template name="oembedImageWidget">
 	{{#if showImage}}
-		<a href="{{url}}" class="swipebox" target="_blank">
-			{{#if parsedUrl}}
-				<div class="inline-image" style="background-image: url({{url}});"></div>
-			{{/if}}
-		</a>
+		{{#if parsedUrl}}
+			<div>
+				<a href="{{url}}" class="swipebox" target="_blank">
+					<div class="inline-image" style="background-image: url({{url}});">
+						<img src="{{url}}">
+					</div>
+				</a>
+			</div>
+		{{/if}}
 	{{else}}
 		{{#if parsedUrl}}
 			<div class="image-to-download" data-url="{{url}}">
diff --git a/packages/rocketchat-theme/assets/stylesheets/base.less b/packages/rocketchat-theme/assets/stylesheets/base.less
index 1f106971bc8..e3625821c6d 100644
--- a/packages/rocketchat-theme/assets/stylesheets/base.less
+++ b/packages/rocketchat-theme/assets/stylesheets/base.less
@@ -2520,7 +2520,16 @@ a.github-fork {
 			background-size: contain;
 			background-repeat: no-repeat;
 			background-position: center left;
-			height: 200px;
+			display: inline-flex;
+			box-shadow: inset 0 0 0 1px rgba(0,0,0,.1);
+			border-radius: 3px;
+			overflow: hidden;
+
+			img {
+				max-height: 200px;
+				max-width: 100%;
+				opacity: 0;
+			}
 		}
 	}
 	&.temp .body {