diff --git a/scripts/rpc/nvmf.py b/scripts/rpc/nvmf.py
index 915c04b4b..ca49fdc35 100644
--- a/scripts/rpc/nvmf.py
+++ b/scripts/rpc/nvmf.py
@@ -291,8 +291,10 @@ def nvmf_subsystem_remove_listener(
             True or False
     """
     listen_address = {'trtype': trtype,
-                      'traddr': traddr,
-                      'trsvcid': trsvcid}
+                      'traddr': traddr}
+
+    if trsvcid:
+        listen_address['trsvcid'] = trsvcid
 
     if adrfam:
         listen_address['adrfam'] = adrfam