diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 1353fac51ff48884e738a7003260cdd451a2f58f..04932d693849e20afd0e482631f2cf380ebb146b 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -290,7 +290,7 @@ class View {
 		$absolutePath = $this->getAbsolutePath($path);
 		$mount = Filesystem::getMountManager()->find($absolutePath);
 		if ($mount->getInternalPath($absolutePath) === '') {
-			return $this->removeMount($mount, $path);
+			return $this->removeMount($mount, $absolutePath);
 		}
 		if ($this->is_dir($path)) {
 			return $this->basicOperation('rmdir', $path, array('delete'));
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 94f9e2091523044d44d7c44d18d5080c7d60cfd5..c0845a5613c37fb4e3f34135dd7e4ea84cb49224 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -2275,4 +2275,53 @@ class View extends \Test\TestCase {
 		}
 		return null;
 	}
+
+
+	public function testRemoveMoveableMountPoint() {
+		$mountPoint = '/' . $this->user . '/files/mount/';
+
+		// Mock the mount point
+		$mount = $this->getMockBuilder('\Test\TestMoveableMountPoint')
+			->disableOriginalConstructor()
+			->getMock();
+		$mount->expects($this->once())
+			->method('getMountPoint')
+			->willReturn($mountPoint);
+		$mount->expects($this->once())
+			->method('removeMount')
+			->willReturn('foo');
+		$mount->expects($this->any())
+			->method('getInternalPath')
+			->willReturn('');
+
+		// Register mount
+		\OC\Files\Filesystem::getMountManager()->addMount($mount);
+
+		// Listen for events
+		$eventHandler = $this->getMockBuilder('\stdclass')
+			->setMethods(['umount', 'post_umount'])
+			->getMock();
+		$eventHandler->expects($this->once())
+			->method('umount')
+			->with([\OC\Files\Filesystem::signal_param_path => '/mount']);
+		$eventHandler->expects($this->once())
+			->method('post_umount')
+			->with([\OC\Files\Filesystem::signal_param_path => '/mount']);
+		\OCP\Util::connectHook(
+			\OC\Files\Filesystem::CLASSNAME,
+			'umount',
+			$eventHandler,
+			'umount'
+		);
+		\OCP\Util::connectHook(
+			\OC\Files\Filesystem::CLASSNAME,
+			'post_umount',
+			$eventHandler,
+			'post_umount'
+		);
+
+		//Delete the mountpoint
+		$view = new \OC\Files\View('/' . $this->user . '/files');
+		$this->assertEquals('foo', $view->rmdir('mount'));
+	}
 }