diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php
index e1cfc8023..4dd2b05c3 100644
--- a/lib/Service/BoardService.php
+++ b/lib/Service/BoardService.php
@@ -625,11 +625,9 @@ class BoardService {
 			} catch (\Exception $e) {
 			}
 		}
-		$delete = $this->aclMapper->delete($acl);
 
 		$this->eventDispatcher->dispatchTyped(new AclDeletedEvent($acl));
-
-		return $delete;
+		return (bool) $this->aclMapper->delete($acl);
 	}
 
 	/**
diff --git a/tests/unit/Service/BoardServiceTest.php b/tests/unit/Service/BoardServiceTest.php
index 0e8bfeb15..702e16cd4 100644
--- a/tests/unit/Service/BoardServiceTest.php
+++ b/tests/unit/Service/BoardServiceTest.php
@@ -420,7 +420,7 @@ class BoardServiceTest extends TestCase {
 		$this->aclMapper->expects($this->once())
 			->method('delete')
 			->with($acl)
-			->willReturn(true);
+			->willReturn($acl);
 		$this->assertTrue($this->service->deleteAcl(123));
 	}
 }
diff --git a/tests/unit/Service/CardServiceTest.php b/tests/unit/Service/CardServiceTest.php
index 622b22c5b..ca260dc9b 100644
--- a/tests/unit/Service/CardServiceTest.php
+++ b/tests/unit/Service/CardServiceTest.php
@@ -160,6 +160,7 @@ class CardServiceTest extends TestCase {
 		$cardExpected->setAssignedUsers(['user1', 'user2']);
 		$cardExpected->setRelatedBoard($boardMock);
 		$cardExpected->setRelatedStack($stackMock);
+		$cardExpected->setLabels([]);
 		$this->assertEquals($cardExpected, $this->cardService->find(123));
 	}