diff --git a/synapse/cli/__main__.py b/synapse/cli/__main__.py
index 9f8748a..965f5a1 100755
--- a/synapse/cli/__main__.py
+++ b/synapse/cli/__main__.py
@@ -37,7 +37,7 @@ def setup_device_uri(args):
     if not is_valid_ip(args.uri):
         # User passed in a name
         console = Console()
-        device_ip = find_device_by_name(args.uri, console)
+        device_ip = find_device_by_name(args.uri, console, False, 60)
         if not device_ip:
             return None
         args.uri = device_ip
diff --git a/synapse/utils/discover.py b/synapse/utils/discover.py
index f1d9098..f8f1003 100644
--- a/synapse/utils/discover.py
+++ b/synapse/utils/discover.py
@@ -57,16 +57,19 @@ def discover(timeout_sec=DISCOVERY_TIMEOUT_SEC):
     return list(discover_iter(timeout_sec))
 
 
-def find_device_by_name(name, console, include_rpc_port=False):
+def find_device_by_name(
+    name,
+    console,
+    include_rpc_port=False,
+    discovery_timeout_sec=5,
+):
     """Find a device by name using the discovery process."""
     with console.status(
         f"Searching for device with name {name}...", spinner="bouncingBall"
     ):
         # We are broadcasting data every 1 second
-        socket_timeout_sec = 1
-        discovery_timeout_sec = 5
         found_devices = []
-        devices = discover_iter(socket_timeout_sec, discovery_timeout_sec)
+        devices = discover_iter(1, discovery_timeout_sec)
         for device in devices:
             if device.name.lower() == name.lower():
                 if include_rpc_port: