diff --git a/stack.sh b/stack.sh
index c6652e5..0c36e10 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1022,6 +1022,9 @@
     setup_dev_lib "python-openstackclient"
 else
     pip_install_gr python-openstackclient
+    if is_service_enabled openstack-cli-server; then
+        install_openstack_cli_server
+    fi
 fi
 
 # Installs alias for osc so that we can collect timing for all