diff --git a/tests/rigctld.c b/tests/rigctld.c
index dbade4a28..e029a0df3 100644
--- a/tests/rigctld.c
+++ b/tests/rigctld.c
@@ -929,6 +929,10 @@ void * handle_socket(void *arg)
         {
           retcode = 1;
         }
+      if (retcode == 1) 
+        {
+          retcode = rig_open(my_rig);
+        }
     }
     while (retcode == 0 || retcode == 2 || retcode == -RIG_ENAVAIL);