diff --git a/modules/email/mu4e/autoload/mu-lock.el b/modules/email/mu4e/autoload/mu-lock.el
index 22403e4f2..14cf1b01d 100644
--- a/modules/email/mu4e/autoload/mu-lock.el
+++ b/modules/email/mu4e/autoload/mu-lock.el
@@ -56,10 +56,11 @@ Else, write to this process' PID to the lock file"
     (delete-file +mu4e-lock-request-file)
     (call-process "touch" nil nil nil +mu4e-lock-request-file)
     (funcall orig-fun callback)
-    (setq +mu4e-lock--request-watcher
-          (file-notify-add-watch +mu4e-lock-request-file
-                                 '(change)
-                                 #'+mu4e-lock-request))))
+    (when +mu4e-lock--request-watcher
+      (file-notify-rm-watch +mu4e-lock--request-watcher))
+    (file-notify-add-watch +mu4e-lock-request-file
+                           '(change)
+                           #'+mu4e-lock--request)))
 
 (defvar +mu4e-lock--file-watcher nil)
 (defvar +mu4e-lock--file-just-deleted nil)
@@ -71,23 +72,24 @@ Else, write to this process' PID to the lock file"
   (setq +mu4e-lock--file-watcher
         (file-notify-add-watch +mu4e-lock-file
                                '(change)
-                               #'+mu4e-lock-file-updated)))
+                               #'+mu4e-lock--file-updated)))
 
-(defun +mu4e-lock-request (event)
+(defun +mu4e-lock--request (event)
   "Handle another process requesting the Mu4e lock."
-  (when (equal (nth 1 event) 'created)
+  (when (eq (nth 1 event) 'created)
     (when +mu4e-lock-relaxed
       (mu4e--stop)
       (file-notify-rm-watch +mu4e-lock--file-watcher)
+      (file-notify-rm-watch +mu4e-lock--request-watcher)
       (message "Someone else wants to use Mu4e, releasing lock")
       (delete-file +mu4e-lock-file)
       (run-at-time 0.2 nil #'+mu4e-lock-add-watcher))
     (delete-file +mu4e-lock-request-file)))
 
-(defun +mu4e-lock-file-updated (event)
+(defun +mu4e-lock--file-updated (event)
   (if +mu4e-lock--file-just-deleted
       (+mu4e-lock-add-watcher)
-    (when (equal (nth 1 event) 'deleted)
+    (when (eq (nth 1 event) 'deleted)
       (setq +mu4e-lock--file-just-deleted t)
       (when (and +mu4e-lock-greedy (+mu4e-lock-available t))
         (message "Noticed Mu4e lock was available, grabbed it")