diff --git a/main.js b/main.js
index 4b6a7e0..ad5a056 100644
--- a/main.js
+++ b/main.js
@@ -26,7 +26,7 @@ module.exports = class RibbonOrderLock extends Plugin {
   onunload() {
     this.observer?.disconnect();
     const ribbon = this.getRibbon();
-    if (ribbon) {
+    if (ribbon && this.originalOnChange) {
       ribbon.onChange = this.originalOnChange;
     }
   }
@@ -53,7 +53,7 @@ module.exports = class RibbonOrderLock extends Plugin {
   // our saved order automatically, same as Obsidian's native reorder does
   patchRibbon() {
     const ribbon = this.getRibbon();
-    if (!ribbon) return;
+    if (!ribbon || this.originalOnChange) return;
 
     const original = ribbon.onChange.bind(ribbon);
     this.originalOnChange = original;