diff --git a/apps/files/lib/Command/Scan.php b/apps/files/lib/Command/Scan.php
index fed7eb2565..36fa39e043 100644
--- a/apps/files/lib/Command/Scan.php
+++ b/apps/files/lib/Command/Scan.php
@@ -32,6 +32,7 @@ use Doctrine\DBAL\Connection;
 use OC\Core\Command\Base;
 use OC\Core\Command\InterruptedException;
 use OC\ForbiddenException;
+use OCP\Files\Mount\IMountPoint;
 use OCP\Files\NotFoundException;
 use OCP\Files\StorageNotAvailableException;
 use OCP\IDBConnection;
@@ -102,6 +103,11 @@ class Scan extends Base {
 				null,
 				InputOption::VALUE_NONE,
 				'do not scan folders recursively'
+			)->addOption(
+				'home-only',
+				null,
+				InputOption::VALUE_NONE,
+				'only scan the home storage, ignoring any mounted external storage or share'
 			);
 	}
 
@@ -114,7 +120,7 @@ class Scan extends Base {
 		}
 	}
 
-	protected function scanFiles($user, $path, $verbose, OutputInterface $output, $backgroundScan = false, $recursive = true) {
+	protected function scanFiles($user, $path, $verbose, OutputInterface $output, $backgroundScan = false, $recursive = true, $homeOnly = false) {
 		$connection = $this->reconnectToDatabase($output);
 		$scanner = new \OC\Files\Utils\Scanner($user, $connection, \OC::$server->getLogger());
 		# check on each file/folder if there was a user interrupt (ctrl-c) and throw an exception
@@ -163,7 +169,7 @@ class Scan extends Base {
 			if ($backgroundScan) {
 				$scanner->backgroundScan($path);
 			} else {
-				$scanner->scan($path, $recursive);
+				$scanner->scan($path, $recursive, $homeOnly ? [$this, 'filterHomeMount'] : null);
 			}
 		} catch (ForbiddenException $e) {
 			$output->writeln("<error>Home storage for user $user not writable</error>");
@@ -179,6 +185,10 @@ class Scan extends Base {
 		}
 	}
 
+	public function filterHomeMount(IMountPoint $mountPoint) {
+		// any mountpoint inside '/$user/files/'
+		return substr_count($mountPoint->getMountPoint(), '/') <= 3;
+	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$inputPath = $input->getOption('path');
@@ -236,7 +246,7 @@ class Scan extends Base {
 				}
 				$output->writeln("Starting scan for user $user_count out of $users_total ($user)");
 				# full: printout data if $verbose was set
-				$this->scanFiles($user, $path, $verbose, $output, $input->getOption('unscanned'), ! $input->getOption('shallow'));
+				$this->scanFiles($user, $path, $verbose, $output, $input->getOption('unscanned'), ! $input->getOption('shallow'), $input->getOption('home-only'));
 			} else {
 				$output->writeln("<error>Unknown user $user_count $user</error>");
 			}
diff --git a/lib/private/Files/Utils/Scanner.php b/lib/private/Files/Utils/Scanner.php
index f91696e77b..fe2bf4ccb5 100644
--- a/lib/private/Files/Utils/Scanner.php
+++ b/lib/private/Files/Utils/Scanner.php
@@ -182,15 +182,20 @@ class Scanner extends PublicEmitter {
 
 	/**
 	 * @param string $dir
-	 * @throws \OC\ForbiddenException
-	 * @throws \OCP\Files\NotFoundException
+	 * @param $recursive
+	 * @param callable|null $mountFilter
+	 * @throws ForbiddenException
+	 * @throws NotFoundException
 	 */
-	public function scan($dir = '', $recursive = \OC\Files\Cache\Scanner::SCAN_RECURSIVE) {
+	public function scan($dir = '', $recursive = \OC\Files\Cache\Scanner::SCAN_RECURSIVE, callable $mountFilter = null) {
 		if (!Filesystem::isValidPath($dir)) {
 			throw new \InvalidArgumentException('Invalid path to scan');
 		}
 		$mounts = $this->getMounts($dir);
 		foreach ($mounts as $mount) {
+			if ($mountFilter && !$mountFilter($mount)) {
+				continue;
+			}
 			$storage = $mount->getStorage();
 			if (is_null($storage)) {
 				continue;