diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 1931db62..d09ac5d0 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48">
+<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
   <file src="src/Command/Feed/CreateFeedSourceCommand.php">
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$ulid]]></code>
@@ -525,11 +525,6 @@
       <code><![CDATA[$value]]></code>
     </MissingParamType>
   </file>
-  <file src="src/Security/AzureOidcAuthenticator.php">
-    <RiskyTruthyFalsyComparison>
-      <code><![CDATA[empty($signInName)]]></code>
-    </RiskyTruthyFalsyComparison>
-  </file>
   <file src="src/Security/Voter/UserVoter.php">
     <MissingTemplateParam>
       <code><![CDATA[UserVoter]]></code>
@@ -565,7 +560,6 @@
     </LessSpecificReturnStatement>
     <MissingParamType>
       <code><![CDATA[$data]]></code>
-      <code><![CDATA[$object]]></code>
     </MissingParamType>
     <MissingTemplateParam>
       <code><![CDATA[ProcessorInterface]]></code>
@@ -670,21 +664,12 @@
     </PossiblyNullPropertyAssignmentValue>
   </file>
   <file src="src/State/ScreenProcessor.php">
-    <NullableReturnStatement>
+    <InvalidReturnStatement>
       <code><![CDATA[$screen]]></code>
-    </NullableReturnStatement>
-    <PossiblyNullReference>
-      <code><![CDATA[setCreatedBy]]></code>
-      <code><![CDATA[setDescription]]></code>
-      <code><![CDATA[setEnableColorSchemeChange]]></code>
-      <code><![CDATA[setLocation]]></code>
-      <code><![CDATA[setModifiedBy]]></code>
-      <code><![CDATA[setOrientation]]></code>
-      <code><![CDATA[setResolution]]></code>
-      <code><![CDATA[setScreenLayout]]></code>
-      <code><![CDATA[setSize]]></code>
-      <code><![CDATA[setTitle]]></code>
-    </PossiblyNullReference>
+    </InvalidReturnStatement>
+    <InvalidReturnType>
+      <code><![CDATA[Screen]]></code>
+    </InvalidReturnType>
   </file>
   <file src="src/State/ScreenProvider.php">
     <PossiblyNullPropertyAssignmentValue>
diff --git a/psalm.xml b/psalm.xml
index 94ff6eaa..2d36c754 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -4,7 +4,7 @@
     resolveFromConfigFile="true"
     findUnusedBaselineEntry="true"
     findUnusedCode="false"
-    errorBaseline="./psalm-baseline.xml"
+    errorBaseline="psalm-baseline.xml"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
diff --git a/src/State/AbstractProcessor.php b/src/State/AbstractProcessor.php
index dc158ec9..460e39bf 100644
--- a/src/State/AbstractProcessor.php
+++ b/src/State/AbstractProcessor.php
@@ -53,11 +53,11 @@ public function toOutput(object $object): object
      *
      * This is needed to get an object handled by entity manager.
      *
-     * @param $object
+     * @param \App\Entity\Tenant\Playlist|\App\Entity\Tenant\Screen|\App\Entity\Tenant\ScreenGroup|\App\Entity\Tenant\Slide|\App\Entity\Tenant\Theme $object
      *
      * @return mixed|object|null
      */
-    protected function loadPrevious($object, array $context)
+    protected function loadPrevious(\App\Entity\Tenant\Playlist|\App\Entity\Tenant\ScreenGroup|\App\Entity\Tenant\Screen|\App\Entity\Tenant\Slide|\App\Entity\Tenant\Theme $object, array $context)
     {
         if ($previous = $context['previous_data'] ?? null) {
             $repository = $this->entityManager->getRepository($object::class);
diff --git a/src/State/ScreenProcessor.php b/src/State/ScreenProcessor.php
index 6aacdfa3..668ece9c 100644
--- a/src/State/ScreenProcessor.php
+++ b/src/State/ScreenProcessor.php
@@ -8,7 +8,6 @@
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
 use App\Dto\ScreenInput;
-use App\Entity\Tenant\Playlist;
 use App\Entity\Tenant\PlaylistScreenRegion;
 use App\Entity\Tenant\Screen;
 use App\Repository\PlaylistRepository;