diff --git a/setup/so-setup b/setup/so-setup
index 8ea110e96..17118800a 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -204,9 +204,7 @@ elif [ "$install_type" = 'HELIXSENSOR' ]; then
 elif [ "$install_type" = 'IMPORT' ]; then
 	is_import=true
 elif [ "$install_type" = 'ANALYST' ]; then
-	cd .. || exit 255
-	./so-analyst-install
-	exit 0
+	is_analyst=true
 fi
 
 # Say yes to the dress if its an ISO install
@@ -280,6 +278,11 @@ if ! [ -f /root/install_opt ]; then
 		exec bash /root/manager_setup/securityonion/setup/so-setup "$@"
 	fi
 
+	if [[ $is_analyst ]]; then
+		cd .. || exit 255
+		exec bash so-analyst-install
+	fi
+
 else
 	rm -rf /root/install_opt >> "$setup_log" 2>&1
 fi