diff --git a/overlay/opt/emcomm-tools/bin/et-js8call b/overlay/opt/emcomm-tools/bin/et-js8call
index 9f5783b..a031c1a 100755
--- a/overlay/opt/emcomm-tools/bin/et-js8call
+++ b/overlay/opt/emcomm-tools/bin/et-js8call
@@ -2,7 +2,7 @@
 #
 # Author  : Gaston Gonzalez
 # Date    : 24 October 2024
-# Updated : 20 November 2024
+# Updated : 6 October 2025
 # Purpose : Wrapper script for starting JS8Call with PnP support
 #
 # Preconditions
@@ -32,6 +32,17 @@ notify_user() {
 }
 
 start() {
+
+  # Handle a special case with Xiegu X6100 to pre-initialize the hamlib
+  # client connection. It takes almost 6 seconds for rig control clients
+  # (including the rigctl client) to connect the first time with the X6100.
+  ACTIVE_RADIO=$(et-system-info active-radio)
+  if [[ "${ACTIVE_RADIO}" = "X6100" ]]; then
+    et-log "Priming rig control client connection for ${ACTIVE_RADIO}"
+    notify_user "JS8Call will be slow to start due to rig priming"
+    rigctl -m 2 f > /dev/null
+  fi
+
   /opt/emcomm-tools/bin/et-kill-all && update-config && /usr/bin/js8call &
 
   if [ ! -e /dev/et-gps ]; then
diff --git a/overlay/opt/emcomm-tools/conf/radios.d/xiegu-x6100.json b/overlay/opt/emcomm-tools/conf/radios.d/xiegu-x6100.json
index 498ece8..9371fbe 100644
--- a/overlay/opt/emcomm-tools/conf/radios.d/xiegu-x6100.json
+++ b/overlay/opt/emcomm-tools/conf/radios.d/xiegu-x6100.json
@@ -6,7 +6,7 @@
     "id": "3087",
     "baud": "19200",
     "ptt": "RIG",
-    "conf": "stop_bits=1"
+    "conf": "timeout=1000,retry=1,timeout_retry=1"
   },
   "notes": [
     "Turn on radio",