diff --git a/lib/Push.php b/lib/Push.php
index 618e1b7cd..b27fae54e 100644
--- a/lib/Push.php
+++ b/lib/Push.php
@@ -45,6 +45,7 @@
 use OCP\L10N\IFactory;
 use OCP\Notification\IManager as INotificationManager;
 use OCP\Notification\INotification;
+use OCP\Security\ISecureRandom;
 use OCP\UserStatus\IManager as IUserStatusManager;
 use OCP\UserStatus\IUserStatus;
 use OCP\Util;
@@ -131,6 +132,7 @@ public function __construct(
 		IUserStatusManager $userStatusManager,
 		IFactory $l10nFactory,
 		protected ITimeFactory $timeFactory,
+		protected ISecureRandom $random,
 		LoggerInterface $log,
 	) {
 		$this->db = $connection;
@@ -482,6 +484,17 @@ protected function sendNotificationsToProxies(): void {
 			return;
 		}
 
+		$subscriptionAwareServer = rtrim($this->config->getAppValue(Application::APP_ID, 'subscription_aware_server', 'https://push-notifications.nextcloud.com'), '/');
+		if ($subscriptionAwareServer === 'https://push-notifications.nextcloud.com') {
+			$subscriptionKey = $this->config->getAppValue('support', 'subscription_key');
+		} else {
+			$subscriptionKey = $this->config->getAppValue(Application::APP_ID, 'push_subscription_key');
+			if ($subscriptionKey === '') {
+				$subscriptionKey = $this->createPushSubscriptionKey();
+				$this->config->setAppValue(Application::APP_ID, 'push_subscription_key', $subscriptionKey);
+			}
+		}
+
 		$client = $this->clientService->newClient();
 		foreach ($pushNotifications as $proxyServer => $notifications) {
 			try {
@@ -491,11 +504,8 @@ protected function sendNotificationsToProxies(): void {
 					],
 				];
 
-				if ($proxyServer === 'https://push-notifications.nextcloud.com') {
-					$subscriptionKey = $this->config->getAppValue('support', 'subscription_key');
-					if ($subscriptionKey) {
-						$requestData['headers']['X-Nextcloud-Subscription-Key'] = $subscriptionKey;
-					}
+				if ($subscriptionKey !== '' && $proxyServer === $subscriptionAwareServer) {
+					$requestData['headers']['X-Nextcloud-Subscription-Key'] = $subscriptionKey;
 				}
 
 				$response = $client->post($proxyServer . '/notifications', $requestData);
@@ -781,4 +791,9 @@ protected function deletePushTokenByDeviceIdentifier(string $deviceIdentifier):
 	protected function createFakeUserObject(string $userId): IUser {
 		return new FakeUser($userId);
 	}
+
+	protected function createPushSubscriptionKey(): string {
+		$key = $this->random->generate(25, ISecureRandom::CHAR_ALPHANUMERIC);
+		return implode('-', str_split($key, 5));
+	}
 }
diff --git a/tests/Unit/PushTest.php b/tests/Unit/PushTest.php
index b0390ff38..91ece39a8 100644
--- a/tests/Unit/PushTest.php
+++ b/tests/Unit/PushTest.php
@@ -42,6 +42,7 @@
 use OCP\L10N\IFactory;
 use OCP\Notification\IManager as INotificationManager;
 use OCP\Notification\INotification;
+use OCP\Security\ISecureRandom;
 use OCP\UserStatus\IManager as IUserStatusManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Http\Message\ResponseInterface;
@@ -77,6 +78,8 @@ class PushTest extends TestCase {
 	protected $l10nFactory;
 	/** @var ITimeFactory|MockObject */
 	protected $timeFactory;
+	/** @var ISecureRandom|MockObject */
+	protected $random;
 	/** @var LoggerInterface|MockObject */
 	protected $logger;
 
@@ -94,6 +97,7 @@ protected function setUp(): void {
 		$this->userStatusManager = $this->createMock(IUserStatusManager::class);
 		$this->l10nFactory = $this->createMock(IFactory::class);
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
+		$this->random = $this->createMock(ISecureRandom::class);
 		$this->logger = $this->createMock(LoggerInterface::class);
 
 		$this->cacheFactory->method('createDistributed')
@@ -119,6 +123,7 @@ protected function getPush(array $methods = []) {
 					$this->userStatusManager,
 					$this->l10nFactory,
 					$this->timeFactory,
+					$this->random,
 					$this->logger,
 				])
 				->setMethods($methods)
@@ -135,7 +140,9 @@ protected function getPush(array $methods = []) {
 			$this->cacheFactory,
 			$this->userStatusManager,
 			$this->l10nFactory,
-			$this->logger
+			$this->timeFactory,
+			$this->random,
+			$this->logger,
 		);
 	}
 
@@ -513,6 +520,13 @@ public function testPushToDeviceSending($isDebug) {
 			->with('debug', false)
 			->willReturn($isDebug);
 
+		$this->config
+			->method('getAppValue')
+			->willReturnMap([
+				['notifications', 'subscription_aware_server', 'https://push-notifications.nextcloud.com', 'https://push-notifications.nextcloud.com'],
+				['support', 'subscription_key', '', ''],
+			]);
+
 		$this->l10nFactory
 			->method('getUserLanguage')
 			->with($user)
@@ -821,6 +835,13 @@ public function testPushToDeviceTalkNotification(array $deviceTypes, $isTalkNoti
 			->with('has_internet_connection', true)
 			->willReturn(true);
 
+		$this->config
+			->method('getAppValue')
+			->willReturnMap([
+				['notifications', 'subscription_aware_server', 'https://push-notifications.nextcloud.com', 'https://push-notifications.nextcloud.com'],
+				['support', 'subscription_key', '', ''],
+			]);
+
 		$this->notificationManager->method('isFairUseOfFreePushService')
 			->willReturn(true);