diff --git a/main.c b/main.c
index 9e35bf9..8a9bb98 100644
--- a/main.c
+++ b/main.c
@@ -89,7 +89,7 @@ void usteer_init_defaults(void)
 	config.load_balancing_threshold = 5;
 	config.remote_update_interval = 1000;
 	config.initial_connect_delay = 0;
-	config.remote_node_timeout = 120 * 1000;
+	config.remote_node_timeout = 10;
 
 	config.roam_kick_delay = 100;
 	config.roam_scan_tries = 3;
diff --git a/remote.c b/remote.c
index de183a4..26e91ad 100644
--- a/remote.c
+++ b/remote.c
@@ -479,7 +479,7 @@ static void
 usteer_check_timeout(void)
 {
 	struct usteer_remote_node *node, *tmp;
-	int timeout = config.remote_node_timeout / config.remote_update_interval;
+	int timeout = config.remote_node_timeout;
 
 	list_for_each_entry_safe(node, tmp, &remote_nodes, list) {
 		if (node->check++ > timeout)