diff --git a/config/config.sample.php b/config/config.sample.php
index deecbec1ec..3b5632087f 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -975,7 +975,7 @@ $CONFIG = array(
  * 2 -> Check every time the filesystem is used, causes a performance hit when
  * using external storages, not recommended for regular use.
  */
-'filesystem_check_changes' => 1,
+'filesystem_check_changes' => 0,
 
 /**
  * All css and js files will be served by the web server statically in one js
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index 847cb8492f..78f35ad4a6 100644
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -338,7 +338,7 @@ abstract class Common implements Storage {
 		}
 		if (!isset($this->watcher)) {
 			$this->watcher = new Watcher($storage);
-			$globalPolicy = \OC::$server->getConfig()->getSystemValue('filesystem_check_changes', Watcher::CHECK_ONCE);
+			$globalPolicy = \OC::$server->getConfig()->getSystemValue('filesystem_check_changes', Watcher::CHECK_NEVER);
 			$this->watcher->setPolicy((int)$this->getMountOption('filesystem_check_changes', $globalPolicy));
 		}
 		return $this->watcher;
diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php
index e6947e36a1..acc03cc4c7 100644
--- a/tests/lib/files/cache/watcher.php
+++ b/tests/lib/files/cache/watcher.php
@@ -39,6 +39,7 @@ class Watcher extends \Test\TestCase {
 		$storage = $this->getTestStorage();
 		$cache = $storage->getCache();
 		$updater = $storage->getWatcher();
+		$updater->setPolicy(\OC\Files\Cache\Watcher::CHECK_ONCE);
 
 		//set the mtime to the past so it can detect an mtime change
 		$cache->put('', array('storage_mtime' => 10));
@@ -79,6 +80,7 @@ class Watcher extends \Test\TestCase {
 		$storage = $this->getTestStorage();
 		$cache = $storage->getCache();
 		$updater = $storage->getWatcher();
+		$updater->setPolicy(\OC\Files\Cache\Watcher::CHECK_ONCE);
 
 		//set the mtime to the past so it can detect an mtime change
 		$cache->put('', array('storage_mtime' => 10));
@@ -95,6 +97,7 @@ class Watcher extends \Test\TestCase {
 		$storage = $this->getTestStorage();
 		$cache = $storage->getCache();
 		$updater = $storage->getWatcher();
+		$updater->setPolicy(\OC\Files\Cache\Watcher::CHECK_ONCE);
 
 		//set the mtime to the past so it can detect an mtime change
 		$cache->put('foo.txt', array('storage_mtime' => 10));