diff --git a/lib/private/Files/FileInfo.php b/lib/private/Files/FileInfo.php
index 09a29113485..29922ee30eb 100644
--- a/lib/private/Files/FileInfo.php
+++ b/lib/private/Files/FileInfo.php
@@ -32,6 +32,8 @@
  */
 namespace OC\Files;
 
+use OC\Files\Mount\HomeMountPoint;
+use OCA\Files_Sharing\ISharedMountPoint;
 use OCP\Files\Cache\ICacheEntry;
 use OCP\Files\Mount\IMountPoint;
 use OCP\IUser;
@@ -309,27 +311,12 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
 	 * @return bool
 	 */
 	public function isShared() {
-		$sid = $this->getStorage()->getId();
-		if (!is_null($sid)) {
-			$sid = explode(':', $sid);
-			return ($sid[0] === 'shared');
-		}
-
-		return false;
+		return $this->mount instanceof ISharedMountPoint;
 	}
 
 	public function isMounted() {
-		$storage = $this->getStorage();
-		if ($storage->instanceOfStorage('\OCP\Files\IHomeStorage')) {
-			return false;
-		}
-		$sid = $storage->getId();
-		if (!is_null($sid)) {
-			$sid = explode(':', $sid);
-			return ($sid[0] !== 'home' and $sid[0] !== 'shared');
-		}
-
-		return false;
+		$isHome = $this->mount instanceof HomeMountPoint;
+		return !$isHome && !$this->isShared();
 	}
 
 	/**
diff --git a/tests/lib/Files/FileInfoTest.php b/tests/lib/Files/FileInfoTest.php
index fd2b506beb9..98f51aed67d 100644
--- a/tests/lib/Files/FileInfoTest.php
+++ b/tests/lib/Files/FileInfoTest.php
@@ -9,6 +9,8 @@
 namespace Test\Files;
 
 use OC\Files\FileInfo;
+use OC\Files\Mount\HomeMountPoint;
+use OC\Files\Mount\MountPoint;
 use OC\Files\Storage\Home;
 use OC\Files\Storage\Temporary;
 use OCP\IConfig;
@@ -33,19 +35,27 @@ class FileInfoTest extends TestCase {
 			->willReturn('foo');
 		$user->method('getHome')
 			->willReturn('foo');
+		$storage = new Home(['user' => $user]);
 
 		$fileInfo = new FileInfo(
 			'',
-			new Home(['user' => $user]),
-			'', [], null);
+			$storage,
+			'',
+			[],
+			new HomeMountPoint($user, $storage, '/foo/files')
+		);
 		$this->assertFalse($fileInfo->isMounted());
 	}
 
 	public function testIsMountedNonHomeStorage() {
+		$storage = new Temporary();
 		$fileInfo = new FileInfo(
 			'',
-			new Temporary(),
-			'', [], null);
+			$storage,
+			'',
+			[],
+			new MountPoint($storage, '/foo/files/bar')
+		);
 		$this->assertTrue($fileInfo->isMounted());
 	}
 }