diff --git a/lib/public/AppFramework/Http/Response.php b/lib/public/AppFramework/Http/Response.php
index bdebb12c00d4c..6edd32a1f8b69 100644
--- a/lib/public/AppFramework/Http/Response.php
+++ b/lib/public/AppFramework/Http/Response.php
@@ -11,6 +11,8 @@
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IConfig;
 use OCP\IRequest;
+use OCP\IUserSession;
+use OCP\Server;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -228,7 +230,7 @@ public function getHeaders() {
 		/**
 		 * @psalm-suppress UndefinedClass
 		 */
-		$request = \OCP\Server::get(IRequest::class);
+		$request = Server::get(IRequest::class);
 		$mergeWith = [
 			'X-Request-Id' => $request->getId(),
 			'Cache-Control' => 'no-cache, no-store, must-revalidate',
@@ -245,6 +247,11 @@ public function getHeaders() {
 			$mergeWith['ETag'] = '"' . $this->ETag . '"';
 		}
 
+		$userSession = Server::get(IUserSession::class);
+		if ($user = $userSession->getUser()) {
+			$mergeWith['X-User-Id'] = $user->getUID();
+		}
+
 		return array_merge($mergeWith, $this->headers);
 	}