diff --git a/lib/Db/BoardMapper.php b/lib/Db/BoardMapper.php
index 4889cc56c..5cc5cbc00 100644
--- a/lib/Db/BoardMapper.php
+++ b/lib/Db/BoardMapper.php
@@ -182,7 +182,7 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 
 		// shared with user
 		$qb->resetQueryParts();
-		$qb->selectDistinct('b.id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified')
+		$qb->select('b.id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified')
 			//->selectAlias('1', 'shared')
 			->from('deck_boards', 'b')
 			->innerJoin('b', 'deck_board_acl', 'acl', $qb->expr()->eq('b.id', 'acl.board_id'))
@@ -492,9 +492,9 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * Reset Cache for a 
+	 * Reset Cache for a
 	 * given board or a given user
-	 * 
+	 *
 	 * @param int|null $boardId
 	 * @param int|null $userId
 	 */
diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php
index d7c6deb9a..d09007390 100644
--- a/lib/Service/BoardService.php
+++ b/lib/Service/BoardService.php
@@ -528,7 +528,7 @@ class BoardService {
 		$this->boardMapper->mapAcl($newAcl);
 		$this->changeHelper->boardChanged($boardId);
 
-		$board = $this->find($boardId);
+		$board = $this->boardMapper->find($boardId);
 		$this->clearBoardFromCache($board);
 
 		// TODO: use the dispatched event for this
@@ -731,7 +731,7 @@ class BoardService {
 	/**
 	 * Clean a given board data
 	 * from the Cache
-	 * 
+	 *
 	 * @param OCA\Deck\Db\Board $board
 	 */
 	private function clearBoardFromCache(Board $board) {
diff --git a/lib/Service/PermissionService.php b/lib/Service/PermissionService.php
index 498e8904c..e94d073df 100644
--- a/lib/Service/PermissionService.php
+++ b/lib/Service/PermissionService.php
@@ -241,6 +241,7 @@ class PermissionService {
 		if (array_key_exists((string) $boardId, $this->users) && !$refresh) {
 			return $this->users[(string) $boardId];
 		}
+
 		try {
 			$board = $this->boardMapper->find($boardId);
 		} catch (DoesNotExistException $e) {
diff --git a/tests/unit/Service/BoardServiceTest.php b/tests/unit/Service/BoardServiceTest.php
index 333b85116..0e8bfeb15 100644
--- a/tests/unit/Service/BoardServiceTest.php
+++ b/tests/unit/Service/BoardServiceTest.php
@@ -154,7 +154,7 @@ class BoardServiceTest extends TestCase {
 			->method('find')
 			->with(1)
 			->willReturn($b1);
-		$this->permissionService->expects($this->once())
+		$this->permissionService->expects($this->any())
 			->method('findUsers')
 			->willReturn([
 				'admin' => 'admin',
@@ -258,6 +258,11 @@ class BoardServiceTest extends TestCase {
 			->method('insert')
 			->with($acl)
 			->willReturn($acl);
+		$this->permissionService->expects($this->any())
+			->method('findUsers')
+			->willReturn([
+				'admin' => 'admin',
+			]);
 		$this->assertEquals($acl, $this->service->addAcl(
 			123, 'user', 'admin', true, true, true
 		));
@@ -306,7 +311,7 @@ class BoardServiceTest extends TestCase {
 				->method('checkPermission')
 				->withConsecutive(
 					[$this->boardMapper, 123, Acl::PERMISSION_SHARE, null],
-					[$this->boardMapper, 123, Acl::PERMISSION_MANAGE, null]	
+					[$this->boardMapper, 123, Acl::PERMISSION_MANAGE, null]
 				);
 		} else {
 			$this->aclMapper->expects($this->once())
@@ -329,20 +334,10 @@ class BoardServiceTest extends TestCase {
 			$this->permissionService->expects($this->exactly(3))
 				->method('userCan')
 				->willReturnOnConsecutiveCalls(
-					$currentUserAcl[0], 
-					$currentUserAcl[1], 
+					$currentUserAcl[0],
+					$currentUserAcl[1],
 					$currentUserAcl[2]
 				);
-
-			/* $this->permissionService->expects($this->at(2))
-				->method('userCan')
-				->willReturn($currentUserAcl[0]);
-			$this->permissionService->expects($this->at(3))
-				->method('userCan')
-				->willReturn($currentUserAcl[1]);
-			$this->permissionService->expects($this->at(4))
-				->method('userCan')
-				->willReturn($currentUserAcl[2]); */
 		}
 
 		$user = $this->createMock(IUser::class);
@@ -357,6 +352,11 @@ class BoardServiceTest extends TestCase {
 		$acl->resolveRelation('participant', function ($participant) use (&$user) {
 			return null;
 		});
+		$this->permissionService->expects($this->any())
+			->method('findUsers')
+			->willReturn([
+				'admin' => 'admin',
+			]);
 		$this->notificationHelper->expects($this->once())
 			->method('sendBoardShared');
 		$expected = clone $acl;