diff --git a/CLI/klish/clish_start b/CLI/klish/clish_start
index 0d02f54dec..1952379793 100755
--- a/CLI/klish/clish_start
+++ b/CLI/klish/clish_start
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+# Remove the first arg HOST_PID
+if [[ "$1" == "HOST_PID"* ]]; then
+   shift
+fi
+
 export SONIC_MGMT_ROOT=/usr/sbin
 export SONIC_CLI_ROOT=$SONIC_MGMT_ROOT/cli
 if [ -z $SYSTEM_NAME ]