diff --git a/frontend/afe/moblab_rpc_interface.py b/frontend/afe/moblab_rpc_interface.py
index 04e835c..37b9ef3 100644
--- a/frontend/afe/moblab_rpc_interface.py
+++ b/frontend/afe/moblab_rpc_interface.py
@@ -742,7 +742,10 @@
         builds['fwrw-version'] = rw_firmware
     if ro_firmware:
         builds['fwro-version'] = ro_firmware
-    list_suite_args = map(lambda s: s.strip(), suite_args.split(','))
+    if suite_args:
+        list_suite_args = map(lambda s: s.strip(), suite_args.split(','))
+    else:
+        list_suite_args = None
     afe = frontend.AFE(user='moblab')
     afe.run('create_suite_job', board=board, builds=builds, name=suite,
     pool=pool, run_prod_code=False, test_source_build=build,