diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 8b252e69a1..1f4bd6794f 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -786,6 +786,7 @@ Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
 		}
 		previewURL = previewURL.replace('(', '%28');
 		previewURL = previewURL.replace(')', '%29');
+		previewURL += '&always=0';
 
 		// preload image to prevent delay
 		// this will make the browser cache the image
diff --git a/core/ajax/preview.php b/core/ajax/preview.php
index 5c6d5ce25a..285af3a8a7 100644
--- a/core/ajax/preview.php
+++ b/core/ajax/preview.php
@@ -11,6 +11,7 @@ $file = array_key_exists('file', $_GET) ? (string)$_GET['file'] : '';
 $maxX = array_key_exists('x', $_GET) ? (int)$_GET['x'] : '36';
 $maxY = array_key_exists('y', $_GET) ? (int)$_GET['y'] : '36';
 $scalingUp = array_key_exists('scalingup', $_GET) ? (bool)$_GET['scalingup'] : true;
+$always = array_key_exists('always', $_GET) ? (bool)$_GET['always'] : true;
 
 if ($file === '') {
 	//400 Bad Request
@@ -28,7 +29,7 @@ if ($maxX === 0 || $maxY === 0) {
 
 try {
 	$preview = new \OC\Preview(\OC_User::getUser(), 'files');
-	if (!$preview->isMimeSupported(\OC\Files\Filesystem::getMimeType($file))) {
+	if (!$always and !$preview->isMimeSupported(\OC\Files\Filesystem::getMimeType($file))) {
 		\OC_Response::setStatus(404);
 	} else {
 		$preview->setFile($file);