diff --git a/agent/google_oauth.py b/agent/google_oauth.py
index 9eb55ec19dc31..8ea585a83c4c0 100644
--- a/agent/google_oauth.py
+++ b/agent/google_oauth.py
@@ -227,7 +227,7 @@ def _credentials_lock(timeout_seconds: float = LOCK_TIMEOUT_SECONDS):
                     import fcntl
 
                     fcntl.flock(fd, fcntl.LOCK_UN)
-                except ImportError:
+                except (ImportError, OSError):
                     try:
                         import msvcrt  # type: ignore[import-not-found]
 
diff --git a/hermes_cli/kanban_db.py b/hermes_cli/kanban_db.py
index 5e465e87a6f1d..c070bcad64559 100644
--- a/hermes_cli/kanban_db.py
+++ b/hermes_cli/kanban_db.py
@@ -1072,7 +1072,10 @@ def _cross_process_init_lock(path: Path):
             else:
                 import fcntl
 
-                fcntl.flock(handle.fileno(), fcntl.LOCK_UN)
+                try:
+                    fcntl.flock(handle.fileno(), fcntl.LOCK_UN)
+                except OSError:
+                    pass
         finally:
             handle.close()