diff --git a/lib/private/preview.php b/lib/private/preview.php
index f50bdcb4c9..778007b21f 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -892,16 +892,6 @@ class Preview {
 			self::initProviders();
 		}
 
-		// FIXME: Ugly hack to prevent SVG of being returned if the SVG
-		// provider is not enabled.
-		// This is required because the preview system is designed in a
-		// bad way and relies on opt-in with asterisks (i.e. image/*)
-		// which will lead to the fact that a SVG will also match the image
-		// provider.
-		if($mimeType === 'image/svg+xml' && !array_key_exists('/image\/svg\+xml/', self::$providers)) {
-			return false;
-		}
-
 		foreach(self::$providers as $supportedMimetype => $provider) {
 			if(preg_match($supportedMimetype, $mimeType)) {
 				return true;
diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php
index ec5b87befe..7bcbddc649 100644
--- a/lib/private/preview/image.php
+++ b/lib/private/preview/image.php
@@ -11,7 +11,7 @@ namespace OC\Preview;
 class Image extends Provider {
 
 	public function getMimeType() {
-		return '/image\/.*/';
+		return '/image\/(?!tiff$)(?!svg.*).*/';
 	}
 
 	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {