diff --git a/config/config.sample.php b/config/config.sample.php
index 76de97818d..6dd4516367 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -191,7 +191,7 @@ $CONFIG = array(
 'customclient_ios' => '', //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8
 
 // PREVIEW
-'disable_previews' => false,
+'enable_previews' => true,
 /* the max width of a generated preview, if value is null, there is no limit */
 'preview_max_x' => null,
 /* the max height of a generated preview, if value is null, there is no limit */
diff --git a/lib/preview.php b/lib/preview.php
index a8a8580e22..164ad10ba5 100755
--- a/lib/preview.php
+++ b/lib/preview.php
@@ -569,9 +569,9 @@ class Preview {
 	 * @return void
 	 */
 	private static function initProviders() {
-		if(\OC_Config::getValue('disable_previews', false)) {
+		if(!\OC_Config::getValue('enable_previews', true)) {
 			$provider = new Preview\Unknown();
-			self::$providers = array($provider);
+			self::$providers = array($provider->getMimeType() => $provider);
 			return;
 		}
 
@@ -606,7 +606,7 @@ class Preview {
 	}
 
 	public static function isMimeSupported($mimetype) {
-		if(\OC_Config::getValue('disable_previews', false)) {
+		if(!\OC_Config::getValue('enable_previews', true)) {
 			return false;
 		}