diff --git a/build/psalm-baseline-ocp.xml b/build/psalm-baseline-ocp.xml
index 87a994ea720f8..09d00c0e53860 100644
--- a/build/psalm-baseline-ocp.xml
+++ b/build/psalm-baseline-ocp.xml
@@ -190,18 +190,6 @@
       <code>PreconditionNotMetException</code>
     </InvalidClass>
   </file>
-  <file src="lib/public/Search/SearchResult.php">
-    <InvalidArgument occurrences="1">
-      <code>$cursor</code>
-    </InvalidArgument>
-  </file>
-  <file src="lib/public/Share.php">
-    <InvalidReturnType occurrences="3">
-      <code>array</code>
-      <code>array|bool</code>
-      <code>mixed</code>
-    </InvalidReturnType>
-  </file>
   <file src="lib/public/Template.php">
     <UndefinedFunction occurrences="7">
       <code>\html_select_options($options, $selected, $params)</code>
@@ -217,9 +205,7 @@
     <InvalidReturnStatement occurrences="1">
       <code>\OC_Helper::computerFileSize($str)</code>
     </InvalidReturnStatement>
-    <InvalidReturnType occurrences="1">
-      <code>float</code>
-    </InvalidReturnType>
+    <InvalidReturnType occurrences="1"/>
     <UndefinedClass occurrences="14">
       <code>\OC</code>
       <code>\OC</code>
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index c7e2974b16b6c..950c0d3244dfd 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -1738,11 +1738,6 @@
       <code>\Sabre\Uri\split($this-&gt;principalInfo['uri'])</code>
     </UndefinedFunction>
   </file>
-  <file src="apps/files_versions/lib/Storage.php">
-    <InvalidScalarArgument occurrences="1">
-      <code>$timestamp</code>
-    </InvalidScalarArgument>
-  </file>
   <file src="apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php">
     <InvalidScalarArgument occurrences="1">
       <code>$this-&gt;retries + 1</code>