diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim.xml b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
index 1ffba40f77..7385daacfc 100644
--- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
@@ -240,7 +240,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 1?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3585"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.150 9090 | grep "3585"</command>
   </testCase>
 
   <testCase>
@@ -271,7 +271,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 0?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.150 9090 | grep "3584"</command>
   </testCase>
 
   <testCase>
@@ -302,7 +302,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 1?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3585"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.150 9090 | grep "3585"</command>
   </testCase>
 
   <testCase>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml b/ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml
index 6a4d43f93a..9ef14478b1 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml
@@ -120,7 +120,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 1?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.180 9090 | grep "1234"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.180 9090 | grep "1234"</command>
   </testCase>
 
   <testCase>
@@ -181,7 +181,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 0?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.150 9090 | grep "3584"</command>
   </testCase>
 
   <testCase>
@@ -218,7 +218,7 @@
     <class>Custom_Command</class>
     <desc>UE (1) connected to DU-PCI 1?</desc>
     <node>localhost</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.180 9090 | grep "1234"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 192.168.71.180 9090 | grep "1234"</command>
   </testCase>
 
   <testCase>
diff --git a/ci-scripts/xml_files/container_sa_f1_ho_b210_quectel.xml b/ci-scripts/xml_files/container_sa_f1_ho_b210_quectel.xml
index ff36947a57..2804e3c14e 100644
--- a/ci-scripts/xml_files/container_sa_f1_ho_b210_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_f1_ho_b210_quectel.xml
@@ -129,7 +129,7 @@
     <class>Custom_Command</class>
     <desc>UE connected to DU1?</desc>
     <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3585"</command>
   </testCase>
 
   <testCase>
@@ -152,7 +152,7 @@
     <class>Custom_Command</class>
     <desc>UE connected to DU0?</desc>
     <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3584"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3584"</command>
   </testCase>
 
   <testCase>
@@ -175,7 +175,7 @@
     <class>Custom_Command</class>
     <desc>UE connected to DU1?</desc>
     <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3585"</command>
   </testCase>
 
   <testCase>
diff --git a/ci-scripts/xml_files/container_sa_n2_ho_b210_quectel.xml b/ci-scripts/xml_files/container_sa_n2_ho_b210_quectel.xml
index 84c5a5bea5..1f4c7c1981 100644
--- a/ci-scripts/xml_files/container_sa_n2_ho_b210_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_n2_ho_b210_quectel.xml
@@ -121,7 +121,7 @@
     <class>Custom_Command</class>
     <desc>UE connected to gNB-PCI1?</desc>
     <node>rocket</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3585"</command>
   </testCase>
 
   <testCase>
@@ -144,7 +144,7 @@
     <class>Custom_Command</class>
     <desc>UE connected to gNB-PCI0?</desc>
     <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3584"</command>
+    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3584"</command>
   </testCase>
 
   <testCase>
diff --git a/common/utils/telnetsrv/telnetsrv_ci.c b/common/utils/telnetsrv/telnetsrv_ci.c
index 10f9626ef0..a2bcccd150 100644
--- a/common/utils/telnetsrv/telnetsrv_ci.c
+++ b/common/utils/telnetsrv/telnetsrv_ci.c
@@ -154,10 +154,17 @@ int fetch_du_by_ue_id(char *buf, int debug, telnet_printfunc_t prnt)
   if (!RC.nrrrc)
     ERROR_MSG_RET("no RRC present, cannot list counts\n");
 
-  ue_id_t ue_id = 1;
+  ue_id_t ue_id;
   if (buf) {
     ue_id = strtol(buf, NULL, 10);
+  } else {
+    // No UE ID provided: find the connected UE first
+    rrc_gNB_ue_context_t *ue = get_single_rrc_ue();
+    if (!ue)
+      ERROR_MSG_RET("no single UE in RRC present\n");
+    ue_id = ue->ue_context.rrc_ue_id;
   }
+
   nr_rrc_du_container_t *du = get_du_for_ue(RC.nrrrc[0], ue_id);
 
   if (du) {