diff --git a/settings/js/apps.js b/settings/js/apps.js
index 9c1604cfcd9ff42236569741cde127795d2c2596..bdeddfb84c2cd48f9ec15a3f6561b6928e98e224 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -20,6 +20,11 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		page.find('span.score').html(app.score);
 		page.find('p.description').text(app.description);
 		page.find('img.preview').attr('src', app.preview);
+		if (app.preview && app.preview.length) {
+			page.find('img.preview').show();
+		} else {
+			page.find('img.preview').hide();
+		}
 		page.find('small.externalapp').attr('style', 'visibility:visible');
 		page.find('span.author').text(app.author);
 		page.find('span.licence').text(app.licence);
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 0903b9bd5c429988f4516278e0e688e5776a232b..d60fd82f9175f94b815bb57407cffc0f05787ad3 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -34,7 +34,7 @@
 		class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
 	<span class="score"></span>
 	<p class="description"></p>
-	<img src="" class="preview" />
+	<img src="" class="preview hidden" />
 	<p class="appslink hidden"><a href="#" target="_blank"><?php
 		p($l->t('See application page at apps.owncloud.com'));?></a></p>
 	<p class="license hidden"><?php