diff --git a/edb/server/server.py b/edb/server/server.py
index e91230d141b..e3dcaf57cc5 100644
--- a/edb/server/server.py
+++ b/edb/server/server.py
@@ -392,10 +392,15 @@ def watch_dir(file_modified, _event):
                     handle = new_handle
                     self._file_watch_handles.append(handle)
 
-        def callback(_file_modified, event):
+        def callback(file_modified, event):
             nonlocal handle
             if event == 2:  # CHANGE
                 cb()
+            elif (
+                event == 1 and  # RENAME - macOS issues this event for CHANGE
+                parent_dir / os.fsdecode(file_modified) == pathlib.Path(path)
+            ):
+                cb()
             elif event == 1 or event == 3:  # RENAME, RENAME_CHANGE
                 # File is likely renamed or deleted, stop watching
                 finalizer()