diff --git a/module/Activity/src/Model/SignupFieldValue.php b/module/Activity/src/Model/SignupFieldValue.php
index c1f83eebf7..bed173c973 100644
--- a/module/Activity/src/Model/SignupFieldValue.php
+++ b/module/Activity/src/Model/SignupFieldValue.php
@@ -126,7 +126,7 @@ public function toGdprArray(): array
         return [
             'id' => $this->getId(),
             'value' => $this->getValue(),
-            'option' => $this->getOption()->toGdprArray(),
+            'option' => $this->getOption()?->toGdprArray(),
         ];
     }
 }
diff --git a/module/User/src/Mapper/ApiAppAuthentication.php b/module/User/src/Mapper/ApiAppAuthentication.php
index f4a8718f72..d45c336a34 100644
--- a/module/User/src/Mapper/ApiAppAuthentication.php
+++ b/module/User/src/Mapper/ApiAppAuthentication.php
@@ -57,10 +57,9 @@ public function getLastAuthentication(
     public function getMemberAuthenticationsPerApiApp(MemberModel $member): array
     {
         $qb = $this->getRepository()->createQueryBuilder('a');
-        $qb->select('a, app')
-            ->leftJoin(ApiAppModel::class, 'app', 'WITH', 'a.apiApp = app.id')
+        $qb->select('a')
             ->where('a.user = :user_id')
-            ->groupBy('app.appId')
+            ->groupBy('a.apiApp')
             ->orderBy('a.time', 'DESC')
             ->setParameter('user_id', $member->getLidnr());