diff --git a/src/server.c b/src/server.c
index 5357f0e..7b54005 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1992,20 +1992,22 @@ int patty_ax25_server_run(patty_ax25_server *server) {
 
         timersub(&after, &before, &server->elapsed);
 
-        if (handle_clients(server) < 0) {
-            goto error_io;
-        }
-
-        if (handle_ifaces(server) < 0) {
-            goto error_io;
-        }
-
         if (handle_socks(server) < 0) {
             goto error_io;
         }
 
-        if (accept_client(server) < 0) {
-            goto error_io;
+        if (nready > 0) {
+            if (handle_clients(server) < 0) {
+                goto error_io;
+            }
+
+            if (handle_ifaces(server) < 0) {
+                goto error_io;
+            }
+
+            if (accept_client(server) < 0) {
+                goto error_io;
+            }
         }
     }