diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index d5c9004128..cc973d8dbd 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -4390,26 +4390,6 @@ parameters:
 			count: 2
 			path: libraries/classes/Html/Generator.php
 
-		-
-			message: "#^Instantiated class Slim\\\\Psr7\\\\Factory\\\\ServerRequestFactory not found\\.$#"
-			count: 1
-			path: libraries/classes/Http/Factory/ServerRequestFactory.php
-
-		-
-			message: "#^Instantiated class Slim\\\\Psr7\\\\Factory\\\\UriFactory not found\\.$#"
-			count: 1
-			path: libraries/classes/Http/Factory/ServerRequestFactory.php
-
-		-
-			message: "#^Method PhpMyAdmin\\\\Http\\\\Factory\\\\ServerRequestFactory\\:\\:createServerRequestFactory\\(\\) should return Psr\\\\Http\\\\Message\\\\ServerRequestFactoryInterface but returns Psr\\\\Http\\\\Message\\\\ServerRequestFactoryInterface\\|Slim\\\\Psr7\\\\Factory\\\\ServerRequestFactory\\.$#"
-			count: 1
-			path: libraries/classes/Http/Factory/ServerRequestFactory.php
-
-		-
-			message: "#^Method PhpMyAdmin\\\\Http\\\\Factory\\\\ServerRequestFactory\\:\\:createUriFactory\\(\\) should return Psr\\\\Http\\\\Message\\\\UriFactoryInterface but returns Psr\\\\Http\\\\Message\\\\UriFactoryInterface\\|Slim\\\\Psr7\\\\Factory\\\\UriFactory\\.$#"
-			count: 1
-			path: libraries/classes/Http/Factory/ServerRequestFactory.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\Http\\\\ServerRequest\\:\\:getAttributes\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -10551,7 +10531,7 @@ parameters:
 			path: test/classes/Http/Factory/ServerRequestFactoryTest.php
 
 		-
-			message: "#^Class Slim\\\\Psr7\\\\Factory\\\\ServerRequestFactory not found\\.$#"
+			message: "#^Class Nyholm\\\\Psr7\\\\Factory\\\\Psr17Factory not found\\.$#"
 			count: 1
 			path: test/classes/Http/Factory/ServerRequestFactoryTest.php
 
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index d58e797ba0..cbd0460f02 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -7788,28 +7788,6 @@
       <code>$_REQUEST['unlim_num_rows']</code>
     </RiskyCast>
   </file>
-  <file src="libraries/classes/Http/Factory/ServerRequestFactory.php">
-    <MixedArgument occurrences="1">
-      <code>$serverRequest</code>
-    </MixedArgument>
-    <MixedAssignment occurrences="3">
-      <code>$factory</code>
-      <code>$factory</code>
-      <code>$serverRequest</code>
-    </MixedAssignment>
-    <MixedInferredReturnType occurrences="2">
-      <code>ServerRequestFactoryInterface</code>
-      <code>UriFactoryInterface</code>
-    </MixedInferredReturnType>
-    <MixedReturnStatement occurrences="2">
-      <code>$factory</code>
-      <code>$factory</code>
-    </MixedReturnStatement>
-    <UndefinedClass occurrences="2">
-      <code>SlimServerRequestFactory</code>
-      <code>SlimUriFactory</code>
-    </UndefinedClass>
-  </file>
   <file src="libraries/classes/Image/ImageWrapper.php">
     <TooFewArguments occurrences="1">
       <code>imagefilledpolygon($this-&gt;image, $points, $color)</code>
@@ -15699,7 +15677,7 @@
     <UndefinedClass occurrences="3">
       <code>GuzzleHttpFactory</code>
       <code>LaminasServerRequestFactory</code>
-      <code>SlimServerRequestFactory</code>
+      <code>NyholmPsr17Factory</code>
     </UndefinedClass>
   </file>
   <file src="test/classes/ImportTest.php">