diff --git a/build/psalm-baseline-ocp.xml b/build/psalm-baseline-ocp.xml
index 208be393e1f..c3bf00b8926 100644
--- a/build/psalm-baseline-ocp.xml
+++ b/build/psalm-baseline-ocp.xml
@@ -60,14 +60,6 @@
       <code>$jobList</code>
     </MoreSpecificImplementedParamType>
   </file>
-  <file src="lib/public/Dashboard/Model/WidgetTemplate.php">
-    <InvalidNullableReturnType occurrences="1">
-      <code>WidgetSetting</code>
-    </InvalidNullableReturnType>
-    <NullableReturnStatement occurrences="1">
-      <code>null</code>
-    </NullableReturnStatement>
-  </file>
   <file src="lib/public/Defaults.php">
     <UndefinedClass occurrences="1">
       <code>\OC</code>
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index b1f1b737492..6c200c045e2 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -919,7 +919,7 @@
     </InvalidArgument>
   </file>
   <file src="apps/files/appinfo/routes.php">
-    <InvalidScope occurrences="2">
+    <InvalidScope occurrences="1">
       <code>$this</code>
       <code>$this</code>
     </InvalidScope>
@@ -3697,14 +3697,6 @@
       <code>$jobList</code>
     </MoreSpecificImplementedParamType>
   </file>
-  <file src="lib/public/Dashboard/Model/WidgetTemplate.php">
-    <InvalidNullableReturnType occurrences="1">
-      <code>WidgetSetting</code>
-    </InvalidNullableReturnType>
-    <NullableReturnStatement occurrences="1">
-      <code>null</code>
-    </NullableReturnStatement>
-  </file>
   <file src="lib/public/Diagnostics/IQueryLogger.php">
     <LessSpecificImplementedReturnType occurrences="1">
       <code>mixed</code>