diff --git a/setup/so-setup b/setup/so-setup
index 8bf893d8c..e06b5ded9 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -102,6 +102,9 @@ if [[ $is_analyst ]]; then
 	if ! whiptail_analyst_install; then
 		if [[ $is_analyst_iso ]]; then
 			if whiptail_analyst_nongrid_iso; then
+				# Remove setup from auto launching
+				parse_install_username
+				sed -i '$ d' /home/$INSTALLUSERNAME/.bash_profile >> "$setup_log" 2>&1
 				echo "Enabling graphical interface and setting it to load at boot"
 				systemctl set-default graphical.target
 				startx