diff --git a/tools/map_syncer/map_syncer.py b/tools/map_syncer/map_syncer.py
index a7a20f4..0842179 100755
--- a/tools/map_syncer/map_syncer.py
+++ b/tools/map_syncer/map_syncer.py
@@ -17,6 +17,7 @@
 import queue
 import shutil
 import signal
+import socket
 import sys
 import threading
 import time
@@ -48,6 +49,10 @@
 DEFAULT_DELETE_AFTER = 4 * 60 * 60  # 4 hours
 DEFAULT_POLL_INTERVAL = 10 * 60  # 10 minutes
 
+# In some rare instances, sockets can get stuck. Let's make sure that
+# we timeout them after some time for all socket oprations.
+socket.setdefaulttimeout(60)
+
 
 @dataclass
 class LiveMapEntry: