diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 26ee47735ad..ec9f5c4cac9 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -4059,16 +4059,6 @@
       <code><![CDATA[isAdmin]]></code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="lib/private/Http/Client/Response.php">
-    <InvalidNullableReturnType>
-      <code><![CDATA[string|resource]]></code>
-    </InvalidNullableReturnType>
-    <NullableReturnStatement>
-      <code><![CDATA[$this->stream ?
-			$this->response->getBody()->detach():
-			$this->response->getBody()->getContents()]]></code>
-    </NullableReturnStatement>
-  </file>
   <file src="lib/private/Installer.php">
     <InvalidArgument>
       <code><![CDATA[false]]></code>
diff --git a/lib/private/Http/Client/Response.php b/lib/private/Http/Client/Response.php
index adf83306d07..dc0b17ab075 100644
--- a/lib/private/Http/Client/Response.php
+++ b/lib/private/Http/Client/Response.php
@@ -11,49 +11,25 @@ namespace OC\Http\Client;
 use OCP\Http\Client\IResponse;
 use Psr\Http\Message\ResponseInterface;
 
-/**
- * Class Response
- *
- * @package OC\Http
- */
 class Response implements IResponse {
-	/** @var ResponseInterface */
-	private $response;
+	private ResponseInterface $response;
+	private bool $stream;
 
-	/**
-	 * @var bool
-	 */
-	private $stream;
-
-	/**
-	 * @param ResponseInterface $response
-	 * @param bool $stream
-	 */
-	public function __construct(ResponseInterface $response, $stream = false) {
+	public function __construct(ResponseInterface $response, bool $stream = false) {
 		$this->response = $response;
 		$this->stream = $stream;
 	}
 
-	/**
-	 * @return string|resource
-	 */
 	public function getBody() {
 		return $this->stream ?
 			$this->response->getBody()->detach():
 			$this->response->getBody()->getContents();
 	}
 
-	/**
-	 * @return int
-	 */
 	public function getStatusCode(): int {
 		return $this->response->getStatusCode();
 	}
 
-	/**
-	 * @param string $key
-	 * @return string
-	 */
 	public function getHeader(string $key): string {
 		$headers = $this->response->getHeader($key);
 
@@ -64,9 +40,6 @@ class Response implements IResponse {
 		return $headers[0];
 	}
 
-	/**
-	 * @return array
-	 */
 	public function getHeaders(): array {
 		return $this->response->getHeaders();
 	}
diff --git a/lib/public/Http/Client/IResponse.php b/lib/public/Http/Client/IResponse.php
index deec2cf97b1..53032ef2a37 100644
--- a/lib/public/Http/Client/IResponse.php
+++ b/lib/public/Http/Client/IResponse.php
@@ -15,8 +15,9 @@ namespace OCP\Http\Client;
  */
 interface IResponse {
 	/**
-	 * @return string|resource
+	 * @return null|resource|string
 	 * @since 8.1.0
+	 * @sicne 8.2.0 with stream enabled, the function returns null or a resource
 	 */
 	public function getBody();