diff --git a/apps/webhook_listeners/lib/Service/TokenService.php b/apps/webhook_listeners/lib/Service/TokenService.php
index 8d2d68141638e..b1c74ffddb688 100644
--- a/apps/webhook_listeners/lib/Service/TokenService.php
+++ b/apps/webhook_listeners/lib/Service/TokenService.php
@@ -84,7 +84,7 @@ public function getTokens(WebhookListener $webhookListener, ?string $triggerUser
 					$tokens['user_ids'][$userId] = [
 						'userId' => $userId,
 						'token' => $this->createEphemeralToken($userId),
-						'baseUrl' => $this->urlGenerator->getBaseUrl()
+						'baseUrl' => rtrim($this->urlGenerator->getAbsoluteURL('/'), '/'),
 					];
 				} catch (\Exception $e) {
 					$this->logger->error('Webhook token creation for user ' . $userId . ' failed: ' . $e->getMessage(), ['exception' => $e]);
@@ -104,7 +104,7 @@ public function getTokens(WebhookListener $webhookListener, ?string $triggerUser
 						$tokens['owner'] = [
 							'userId' => $ownerId,
 							'token' => $this->createEphemeralToken($ownerId),
-							'baseUrl' => $this->urlGenerator->getBaseUrl()
+							'baseUrl' => rtrim($this->urlGenerator->getAbsoluteURL('/'), '/'),
 						];
 						break;
 					case 'trigger':
@@ -115,7 +115,7 @@ public function getTokens(WebhookListener $webhookListener, ?string $triggerUser
 						$tokens['trigger'] = [
 							'userId' => $triggerUserId,
 							'token' => $this->createEphemeralToken($triggerUserId),
-							'baseUrl' => $this->urlGenerator->getBaseUrl()
+							'baseUrl' => rtrim($this->urlGenerator->getAbsoluteURL('/'), '/'),
 						];
 						break;
 					default: