diff --git a/cmd/config.go b/cmd/config.go
index 5c7efbba41..9e48cb0672 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -48,6 +48,9 @@ func addConfigFlags(flags *pflag.FlagSet) {
 	flags.String("branding.files", "", "path to directory with images and custom styles")
 	flags.Bool("branding.disableExternal", false, "disable external links such as GitHub links")
 	flags.Bool("branding.disableUsedPercentage", false, "disable used disk percentage graph")
+
+	flags.String("onlyoffice.url", "", "onlyoffice integration url")
+	flags.String("onlyoffice.jwtSecret", "", "onlyoffice integration secret")
 }
 
 //nolint:gocyclo
diff --git a/files/file.go b/files/file.go
index b09503ede6..534f701405 100644
--- a/files/file.go
+++ b/files/file.go
@@ -197,21 +197,12 @@ func (i *FileInfo) Checksum(algo string) error {
 }
 
 func (i *FileInfo) RealPath() string {
-	if realPathFs, ok := i.Fs.(interface {
-		RealPath(name string) (fPath string, err error)
-	}); ok {
-		realPath, err := realPathFs.RealPath(i.Path)
-		if err == nil {
-			return realPath
-		}
-	}
-
-	return i.Path
+	return GetRealPath(i.Fs, i.Path)
 }
 
 // TODO: use constants
 //
-//nolint:goconst
+//nolint:goconst,gocyclo
 func (i *FileInfo) detectType(modify, saveContent, readHeader bool) error {
 	if IsNamedPipe(i.Mode) {
 		i.Type = "blob"
@@ -270,7 +261,8 @@ func (i *FileInfo) detectType(modify, saveContent, readHeader bool) error {
 			i.Content = string(content)
 		}
 		return nil
-	case strings.HasPrefix(mimetype, "application/vnd.openxmlformats-officedocument"):
+	case strings.HasPrefix(mimetype, "application/vnd.openxmlformats-officedocument"),
+		strings.HasPrefix(mimetype, "application/vnd.oasis.opendocument"):
 		i.Type = "officedocument"
 		return nil
 	default:
diff --git a/files/utils.go b/files/utils.go
index f4b0365dd2..756c940f2f 100644
--- a/files/utils.go
+++ b/files/utils.go
@@ -3,6 +3,8 @@ package files
 import (
 	"os"
 	"unicode/utf8"
+
+	"github.com/spf13/afero"
 )
 
 func isBinary(content []byte) bool {
@@ -57,3 +59,16 @@ func IsNamedPipe(mode os.FileMode) bool {
 func IsSymlink(mode os.FileMode) bool {
 	return mode&os.ModeSymlink != 0
 }
+
+func GetRealPath(fs afero.Fs, path string) string {
+	if realPathFs, ok := fs.(interface {
+		RealPath(name string) (fPath string, err error)
+	}); ok {
+		realPath, err := realPathFs.RealPath(path)
+		if err == nil {
+			return realPath
+		}
+	}
+
+	return path
+}
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 52bc34f6cc..5f1e72225e 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -13,7 +13,6 @@
         "core-js": "^3.32.0",
         "css-vars-ponyfill": "^2.4.8",
         "filesize": "^10.0.8",
-        "jose": "^4.13.1",
         "js-base64": "^3.7.5",
         "lodash.clonedeep": "^4.5.0",
         "lodash.throttle": "^4.1.1",
@@ -3659,13 +3658,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/jose": {
-      "version": "4.15.4",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/panva"
-      }
-    },
     "node_modules/js-base64": {
       "version": "3.7.5",
       "license": "BSD-3-Clause"
diff --git a/frontend/package.json b/frontend/package.json
index e04a36e014..b0ff7612c5 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -19,7 +19,6 @@
     "core-js": "^3.32.0",
     "css-vars-ponyfill": "^2.4.8",
     "filesize": "^10.0.8",
-    "jose": "^4.13.1",
     "js-base64": "^3.7.5",
     "lodash.clonedeep": "^4.5.0",
     "lodash.throttle": "^4.1.1",
diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js
index f0142bb061..bfd1b4729c 100644
--- a/frontend/src/utils/constants.js
+++ b/frontend/src/utils/constants.js
@@ -18,7 +18,7 @@ const enableExec = window.FileBrowser.EnableExec;
 const tusSettings = window.FileBrowser.TusSettings;
 const origin = window.location.origin;
 const tusEndpoint = `/api/tus`;
-const onlyOffice = window.FileBrowser.OnlyOffice;
+const onlyOfficeUrl = window.FileBrowser.OnlyOfficeUrl;
 
 export {
   name,
@@ -40,5 +40,5 @@ export {
   tusSettings,
   origin,
   tusEndpoint,
-  onlyOffice,
+  onlyOfficeUrl,
 };
diff --git a/frontend/src/views/Files.vue b/frontend/src/views/Files.vue
index 27c9ac5e07..693d0a5ffe 100644
--- a/frontend/src/views/Files.vue
+++ b/frontend/src/views/Files.vue
@@ -22,7 +22,7 @@
 <script>
 import { files as api } from "@/api";
 import { mapState, mapMutations } from "vuex";
-import { onlyOffice } from "@/utils/constants";
+import { onlyOfficeUrl } from "@/utils/constants";
 
 import HeaderBar from "@/components/header/HeaderBar.vue";
 import Breadcrumbs from "@/components/Breadcrumbs.vue";
@@ -61,7 +61,7 @@ export default {
         this.req.type === "textImmutable"
       ) {
         return "editor";
-      } else if (this.req.type === "officedocument" && onlyOffice !== "") {
+      } else if (this.req.type === "officedocument" && onlyOfficeUrl) {
         return "OnlyOfficeEditor";
       } else {
         return "preview";
diff --git a/frontend/src/views/files/OnlyOfficeEditor.vue b/frontend/src/views/files/OnlyOfficeEditor.vue
index bb76dce826..e802a96965 100644
--- a/frontend/src/views/files/OnlyOfficeEditor.vue
+++ b/frontend/src/views/files/OnlyOfficeEditor.vue
@@ -4,29 +4,24 @@
       <action icon="close" :label="$t('buttons.close')" @action="close()" />
       <title>{{ req.name }}</title>
     </header-bar>
-
     <breadcrumbs base="/files" noLink />
-
-    <div id="editor"></div>
+    <errors v-if="error" :errorCode="error.status" />
+    <div id="editor">
+      <div id="onlyoffice-editor"></div>
+    </div>
   </div>
 </template>
 
-<style scoped>
-#editor-container {
-  height: 100vh;
-  width: 100vw;
-}
-</style>
-
 <script>
 import { mapState } from "vuex";
 import url from "@/utils/url";
-import { baseURL, onlyOffice } from "@/utils/constants";
-import * as jose from "jose";
+import { onlyOfficeUrl } from "@/utils/constants";
 
 import HeaderBar from "@/components/header/HeaderBar.vue";
 import Action from "@/components/header/Action.vue";
 import Breadcrumbs from "@/components/Breadcrumbs.vue";
+import Errors from "@/views/Errors.vue";
+import { fetchJSON } from "@/api/utils";
 
 export default {
   name: "onlyofficeeditor",
@@ -34,9 +29,13 @@ export default {
     HeaderBar,
     Action,
     Breadcrumbs,
+    Errors,
   },
   data: function () {
-    return {};
+    return {
+      error: null,
+      clientConfig: null,
+    };
   },
   computed: {
     ...mapState(["req", "user", "jwt"]),
@@ -71,6 +70,10 @@ export default {
     },
   },
   created() {
+    const isMobile = window.innerWidth <= 736;
+    this.clientConfigPromise = fetchJSON(
+      `/api/onlyoffice/client-config${this.req.path}?isMobile=${isMobile}`
+    );
     window.addEventListener("keydown", this.keyEvent);
   },
   beforeDestroy() {
@@ -78,69 +81,20 @@ export default {
     this.editor.destroyEditor();
   },
   mounted: function () {
-    let onlyofficeScript = document.createElement("script");
-    onlyofficeScript.setAttribute(
-      "src",
-      `${onlyOffice.url}/web-apps/apps/api/documents/api.js`
-    );
+    const scriptUrl = `${onlyOfficeUrl}/web-apps/apps/api/documents/api.js`;
+    const onlyofficeScript = document.createElement("script");
+    onlyofficeScript.setAttribute("src", scriptUrl);
     document.head.appendChild(onlyofficeScript);
 
-    /*eslint-disable */
-    onlyofficeScript.onload = () => {
-      let fileUrl = `${window.location.protocol}//${window.location.host}${baseURL}/api/raw${url.encodePath(
-        this.req.path
-      )}?auth=${this.jwt}`;
-
-      // create a key from the last modified timestamp and the reversed file path (most specific part first)
-      // replace all special characters (only these symbols are supported: 0-9, a-z, A-Z, -._=)
-      // and truncate it (max length is 20 characters)
-      const key = (
-        Date.parse(this.req.modified).valueOf()
-        + url
-          .encodePath(this.req.path.split('/').reverse().join(''))
-          .replaceAll(/[!~[\]*'()/,;:\-%+. ]/g, "")
-      ).substring(0, 20);
-
-      const config = {
-        document: {
-          fileType: this.req.extension.substring(1),
-          key: key,
-          title: this.req.name,
-          url: fileUrl,
-          permissions: {
-            edit: this.user.perm.modify,
-            download: this.user.perm.download,
-            print: this.user.perm.download
-          }
-        },
-        editorConfig: {
-          callbackUrl: `${window.location.protocol}//${window.location.host}${baseURL}/api/onlyoffice/callback?auth=${this.jwt}&save=${encodeURIComponent(this.req.path)}`,
-          user: {
-            id: this.user.id,
-            name: `User ${this.user.id}`
-          },
-          customization: {
-            autosave: true,
-            forcesave: true
-          },
-          lang: this.user.locale,
-          mode: this.user.perm.modify ? "edit" : "view"
-        }
-      };
-
-      if(onlyOffice.jwtSecret != "") {
-        const alg = 'HS256';
-        new jose.SignJWT(config)
-          .setProtectedHeader({ alg })
-          .sign(new TextEncoder().encode(onlyOffice.jwtSecret)).then((jwt) => {
-            config.token = jwt;
-            this.editor = new DocsAPI.DocEditor("editor", config);
-          })
-      } else {
-        this.editor = new DocsAPI.DocEditor("editor", config);
+    onlyofficeScript.onload = async () => {
+      try {
+        const clientConfig = await this.clientConfigPromise;
+        // eslint-disable-next-line no-undef
+        this.editor = new DocsAPI.DocEditor("onlyoffice-editor", clientConfig);
+      } catch (e) {
+        this.error = e;
       }
     };
-    /*eslint-enable */
   },
   methods: {
     back() {
diff --git a/go.mod b/go.mod
index 674baa179e..bdccdcc490 100644
--- a/go.mod
+++ b/go.mod
@@ -31,6 +31,7 @@ require (
 )
 
 require (
+	github.com/allegro/bigcache v1.2.1 // indirect
 	github.com/andybalholm/brotli v1.0.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
diff --git a/go.sum b/go.sum
index a001e03876..f0c6e4268c 100644
--- a/go.sum
+++ b/go.sum
@@ -42,6 +42,8 @@ github.com/DataDog/zstd v1.4.1 h1:3oxKN3wbHibqx897utPC2LTQU4J+IHWWJO+glkAkpFM=
 github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
 github.com/Sereal/Sereal v0.0.0-20190618215532-0b8ac451a863 h1:BRrxwOZBolJN4gIwvZMJY1tzqBvQgpaZiQRuIDD40jM=
 github.com/Sereal/Sereal v0.0.0-20190618215532-0b8ac451a863/go.mod h1:D0JMgToj/WdxCgd30Kc1UcA9E+WdZoJqeVOuYW7iTBM=
+github.com/allegro/bigcache v1.2.1 h1:hg1sY1raCwic3Vnsvje6TT7/pnZba83LeFck5NrFKSc=
+github.com/allegro/bigcache v1.2.1/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
 github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
diff --git a/http/auth.go b/http/auth.go
index 69bc7dfb1e..e6d3736fb2 100644
--- a/http/auth.go
+++ b/http/auth.go
@@ -83,6 +83,7 @@ func withUser(fn handleFunc) handleFunc {
 			w.Header().Add("X-Renew-Token", "true")
 		}
 
+		d.authToken = token.Raw
 		d.user, err = d.store.Users.Get(d.server.Root, tk.User.ID)
 		if err != nil {
 			return http.StatusInternalServerError, err
diff --git a/http/data.go b/http/data.go
index 5ba87313b4..2c86fa465a 100644
--- a/http/data.go
+++ b/http/data.go
@@ -18,11 +18,12 @@ type handleFunc func(w http.ResponseWriter, r *http.Request, d *data) (int, erro
 
 type data struct {
 	*runner.Runner
-	settings *settings.Settings
-	server   *settings.Server
-	store    *storage.Storage
-	user     *users.User
-	raw      interface{}
+	authToken string
+	settings  *settings.Settings
+	server    *settings.Server
+	store     *storage.Storage
+	user      *users.User
+	raw       interface{}
 }
 
 // Check implements rules.Checker.
diff --git a/http/http.go b/http/http.go
index 1d7093fce7..748b438676 100644
--- a/http/http.go
+++ b/http/http.go
@@ -60,6 +60,7 @@ func NewHandler(
 	users.Handle("/{id:[0-9]+}", monkey(userGetHandler, "")).Methods("GET")
 	users.Handle("/{id:[0-9]+}", monkey(userDeleteHandler, "")).Methods("DELETE")
 
+	api.PathPrefix("/onlyoffice").Handler(monkey(onlyofficeClientConfigGetHandler, "/api/onlyoffice/client-config")).Methods("GET")
 	api.PathPrefix("/onlyoffice").Handler(monkey(onlyofficeCallbackHandler, "/api/onlyoffice/callback")).Methods("POST")
 
 	api.PathPrefix("/resources").Handler(monkey(resourceGetHandler, "/api/resources")).Methods("GET")
diff --git a/http/onlyoffice.go b/http/onlyoffice.go
index 55d6416e30..0f58f2a671 100644
--- a/http/onlyoffice.go
+++ b/http/onlyoffice.go
@@ -1,21 +1,125 @@
 package http
 
 import (
+	"crypto/sha256"
+	"encoding/hex"
 	"encoding/json"
 	"errors"
 	"io"
 	"net/http"
+	"net/url"
+	"strconv"
+	"time"
+
+	"github.com/allegro/bigcache"
+	"github.com/golang-jwt/jwt/v4"
+
+	"github.com/filebrowser/filebrowser/v2/files"
+)
+
+const (
+	onlyOfficeStatusDocumentClosedWithChanges       = 2
+	onlyOfficeStatusDocumentClosedWithNoChanges     = 4
+	onlyOfficeStatusForceSaveWhileDocumentStillOpen = 6
+	trueString                                      = "true"         // linter-enforced constant
+	twoDays                                         = 48 * time.Hour // linter enforced constant
+)
+
+var (
+	// Refer to only-office documentation on co-editing
+	// https://api.onlyoffice.com/editors/coedit
+	//
+	// a 48 hour TTL here is not required, because the document server will notify
+	// us when keys should be evicted. However, it is added defensively in order to
+	// prevent potential memory leaks.
+	coeditingDocumentKeys, _ = bigcache.NewBigCache(bigcache.DefaultConfig(twoDays))
 )
 
 type OnlyOfficeCallback struct {
 	ChangesURL string   `json:"changesurl,omitempty"`
-	Key        string   `json:"key"`
-	Status     int      `json:"status"`
+	Key        string   `json:"key,omitempty"`
+	Status     int      `json:"status,omitempty"`
 	URL        string   `json:"url,omitempty"`
 	Users      []string `json:"users,omitempty"`
 	UserData   string   `json:"userdata,omitempty"`
 }
 
+var onlyofficeClientConfigGetHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
+	if d.settings.OnlyOffice.JWTSecret == "" {
+		return http.StatusInternalServerError, errors.New("only-office integration must be configured in settings")
+	}
+
+	if !d.user.Perm.Modify || !d.Check(r.URL.Path) {
+		return http.StatusForbidden, nil
+	}
+
+	referrer, err := getReferer(r)
+	if err != nil {
+		return http.StatusInternalServerError, errors.Join(errors.New("could not determine request referrer"), err)
+	}
+
+	file, err := files.NewFileInfo(files.FileOptions{
+		Fs:         d.user.Fs,
+		Path:       r.URL.Path,
+		Modify:     d.user.Perm.Modify,
+		Expand:     false,
+		ReadHeader: d.server.TypeDetectionByHeader,
+		Checker:    d,
+	})
+
+	if err != nil {
+		return errToStatus(err), err
+	}
+
+	clientConfig := map[string]interface{}{
+		"document": map[string]interface{}{
+			"fileType": file.Extension[1:],
+			"key":      getDocumentKey(file.RealPath()),
+			"title":    file.Name,
+			"url": (&url.URL{
+				Scheme:   referrer.Scheme,
+				Host:     referrer.Host,
+				RawQuery: "auth=" + url.QueryEscape(d.authToken),
+			}).JoinPath(d.server.BaseURL, "/api/raw", file.Path).String(),
+			"permissions": map[string]interface{}{
+				"edit":     d.user.Perm.Modify,
+				"download": d.user.Perm.Download,
+				"print":    d.user.Perm.Download,
+			},
+		},
+		"editorConfig": map[string]interface{}{
+			"callbackUrl": (&url.URL{
+				Scheme:   referrer.Scheme,
+				Host:     referrer.Host,
+				RawQuery: "auth=" + url.QueryEscape(d.authToken) + "&save=" + url.QueryEscape(file.Path),
+			}).JoinPath(d.server.BaseURL, "/api/onlyoffice/callback").String(),
+			"user": map[string]interface{}{
+				"id":   strconv.FormatUint(uint64(d.user.ID), 10),
+				"name": d.user.Username,
+			},
+			"customization": map[string]interface{}{
+				"autosave":  true,
+				"forcesave": true,
+				"uiTheme":   ternary(d.Settings.Branding.Theme == "dark", "default-dark", "default-light"),
+			},
+			"lang": d.user.Locale,
+			"mode": ternary(d.user.Perm.Modify, "edit", "view"),
+		},
+		"type": ternary(r.URL.Query().Get("isMobile") == trueString, "mobile", "desktop"),
+	}
+
+	signature, err := jwt.
+		NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims(clientConfig)).
+		SignedString([]byte(d.Settings.OnlyOffice.JWTSecret))
+
+	if err != nil {
+		return http.StatusInternalServerError, errors.Join(errors.New("could not sign only-office client-config"), err)
+	}
+	clientConfig["token"] = signature
+
+	return renderJSON(w, r, clientConfig)
+})
+
 var onlyofficeCallbackHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
 	body, err := io.ReadAll(r.Body)
 	if err != nil {
@@ -28,12 +132,25 @@ var onlyofficeCallbackHandler = withUser(func(w http.ResponseWriter, r *http.Req
 		return http.StatusInternalServerError, err
 	}
 
-	if data.Status == 2 || data.Status == 6 {
-		docPath := r.URL.Query().Get("save")
-		if docPath == "" {
-			return http.StatusInternalServerError, errors.New("unable to get file save path")
-		}
+	docPath := r.URL.Query().Get("save")
+	if docPath == "" {
+		return http.StatusInternalServerError, errors.New("unable to get file save path")
+	}
 
+	if data.Status == onlyOfficeStatusDocumentClosedWithChanges ||
+		data.Status == onlyOfficeStatusDocumentClosedWithNoChanges {
+		// Refer to only-office documentation
+		// - https://api.onlyoffice.com/editors/coedit
+		// - https://api.onlyoffice.com/editors/callback
+		//
+		// When the document is fully closed by all editors,
+		// then the document key should no longer be re-used.
+		realPath := files.GetRealPath(d.user.Fs, docPath)
+		_ = coeditingDocumentKeys.Delete(realPath)
+	}
+
+	if data.Status == onlyOfficeStatusDocumentClosedWithChanges ||
+		data.Status == onlyOfficeStatusForceSaveWhileDocumentStillOpen {
 		if !d.user.Perm.Modify || !d.Check(docPath) {
 			return http.StatusForbidden, nil
 		}
@@ -44,7 +161,7 @@ var onlyofficeCallbackHandler = withUser(func(w http.ResponseWriter, r *http.Req
 		}
 		defer doc.Body.Close()
 
-		err = d.RunHook(func() error {
+		err = d.Runner.RunHook(func() error {
 			_, writeErr := writeFile(d.user.Fs, docPath, doc.Body)
 			if writeErr != nil {
 				return writeErr
@@ -62,3 +179,38 @@ var onlyofficeCallbackHandler = withUser(func(w http.ResponseWriter, r *http.Req
 	}
 	return renderJSON(w, r, resp)
 })
+
+func getReferer(r *http.Request) (*url.URL, error) {
+	if len(r.Header["Referer"]) != 1 {
+		return nil, errors.New("expected exactly one Referer header")
+	}
+
+	return url.ParseRequestURI(r.Header["Referer"][0])
+}
+
+func getDocumentKey(realPath string) string {
+	// error is intentionally ignored in order treat errors
+	// the same as a cache-miss
+	cachedDocumentKey, _ := coeditingDocumentKeys.Get(realPath)
+
+	if cachedDocumentKey != nil {
+		return string(cachedDocumentKey)
+	} else {
+		timestamp := strconv.FormatInt(time.Now().UnixMilli(), 10)
+		documentKey := hashSHA256(realPath + timestamp)
+		_ = coeditingDocumentKeys.Set(realPath, []byte(documentKey))
+		return documentKey
+	}
+}
+
+func hashSHA256(data string) string {
+	bytes := sha256.Sum256([]byte(data))
+	return hex.EncodeToString(bytes[:])
+}
+
+func ternary(condition bool, trueValue, falseValue string) string {
+	if condition {
+		return trueValue
+	}
+	return falseValue
+}
diff --git a/http/resource.go b/http/resource.go
index 71c1b0d069..9c95103c20 100644
--- a/http/resource.go
+++ b/http/resource.go
@@ -78,7 +78,7 @@ func resourceDeleteHandler(fileCache FileCache) handleFunc {
 			return errToStatus(err), err
 		}
 
-		err = d.RunHook(func() error {
+		err = d.Runner.RunHook(func() error {
 			return d.user.Fs.RemoveAll(r.URL.Path)
 		}, "delete", r.URL.Path, "", d.user)
 
@@ -126,7 +126,7 @@ func resourcePostHandler(fileCache FileCache) handleFunc {
 			}
 		}
 
-		err = d.RunHook(func() error {
+		err = d.Runner.RunHook(func() error {
 			info, writeErr := writeFile(d.user.Fs, r.URL.Path, r.Body)
 			if writeErr != nil {
 				return writeErr
diff --git a/http/static.go b/http/static.go
index f46c24b5a6..2d2aa40ad4 100644
--- a/http/static.go
+++ b/http/static.go
@@ -45,7 +45,7 @@ func handleWithStaticData(w http.ResponseWriter, _ *http.Request, d *data, fSys
 		"ResizePreview":         d.server.ResizePreview,
 		"EnableExec":            d.server.EnableExec,
 		"TusSettings":           d.settings.Tus,
-		"OnlyOffice":            d.settings.OnlyOffice,
+		"OnlyOfficeUrl":         d.settings.OnlyOffice.URL,
 	}
 
 	if d.settings.Branding.Files != "" {
diff --git a/runner/runner.go b/runner/runner.go
index 2dbafa5cd1..f4d8f440e8 100644
--- a/runner/runner.go
+++ b/runner/runner.go
@@ -23,7 +23,7 @@ func (r *Runner) RunHook(fn func() error, evt, path, dst string, user *users.Use
 	dst = user.FullPath(dst)
 
 	if r.Enabled {
-		if val, ok := r.Commands["before_"+evt]; ok {
+		if val, ok := r.Settings.Commands["before_"+evt]; ok {
 			for _, command := range val {
 				err := r.exec(command, "before_"+evt, path, dst, user)
 				if err != nil {
@@ -39,7 +39,7 @@ func (r *Runner) RunHook(fn func() error, evt, path, dst string, user *users.Use
 	}
 
 	if r.Enabled {
-		if val, ok := r.Commands["after_"+evt]; ok {
+		if val, ok := r.Settings.Commands["after_"+evt]; ok {
 			for _, command := range val {
 				err := r.exec(command, "after_"+evt, path, dst, user)
 				if err != nil {