diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index dbb8b62288..b473aec535 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -414,7 +414,7 @@ public function getSettings(string $type, string $access_token): JSONResponse {
 
 		try {
 			$wopi = $this->wopiMapper->getWopiForToken($access_token);
-			if ($wopi->getTokenType() !== Wopi::TOKEN_TYPE_SETTING_AUTH) {
+			if ($wopi->getTokenType() !== Wopi::TOKEN_TYPE_SETTING_AUTH && $wopi->getTokenType() !== Wopi::TOKEN_TYPE_USER) {
 				return new JSONResponse(['error' => 'Invalid token type'], Http::STATUS_BAD_REQUEST);
 			}
 
diff --git a/lib/Middleware/WOPIMiddleware.php b/lib/Middleware/WOPIMiddleware.php
index 26447dd4de..988698c740 100644
--- a/lib/Middleware/WOPIMiddleware.php
+++ b/lib/Middleware/WOPIMiddleware.php
@@ -63,7 +63,7 @@ public function beforeController($controller, $methodName) {
 			return;
 		}
 
-		if (str_contains($this->request->getRequestUri(), '/wopi/settings/upload')) {
+		if (str_contains($this->request->getRequestUri(), '/wopi/settings')) {
 			return;
 		}
 
diff --git a/src/view/Office.vue b/src/view/Office.vue
index 7dc430b922..da89ab2a24 100644
--- a/src/view/Office.vue
+++ b/src/view/Office.vue
@@ -55,6 +55,7 @@
 			<input name="theme" :value="formData.theme" type="hidden">
 			<input name="buy_product" value="https://nextcloud.com/pricing" type="hidden">
 			<input name="host_session_id" :value="formData.hostSessionID" type="hidden">
+			<input name="wopi_setting_base_url" :value="formData.wopiSettingBaseUrl" type="hidden">
 		</form>
 		<iframe :id="iframeId"
 			ref="documentFrame"
@@ -93,6 +94,7 @@ import { getRandomId } from '../helpers/index.js'
 import {
 	getNextcloudUrl,
 	getWopiUrl,
+	getConfigFileUrl,
 } from '../helpers/url.js'
 import PostMessageService from '../services/postMessage.tsx'
 import FilesAppIntegration from './FilesAppIntegration.js'
@@ -198,6 +200,7 @@ export default {
 				cssVariables: generateCSSVarTokens(),
 				theme: getCollaboraTheme(),
 				hostSessionID: 'nextcloud ' + OC.config.version + ' - richdocuments ' + getCapabilities().version,
+				wopiSettingBaseUrl: getConfigFileUrl(),
 			},
 		}
 	},