diff --git a/setup/so-setup b/setup/so-setup
index 30bafc406..8bf893d8c 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -351,7 +351,9 @@ elif [ "$install_type" = 'RECEIVER' ]; then
 	is_minion=true
 	is_receiver=true
 elif [ "$install_type" = 'ANALYST' ]; then
-	exec bash so-setup analyst
+	if [ "$setup_type" != 'analyst' ]; then
+		exec bash so-setup analyst
+	fi
 fi
 
 if [[ $is_manager || $is_import ]]; then
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 5c6129f76..289752667 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -934,21 +934,13 @@ whiptail_install_type_other() {
 
 	# so-analyst-install will only work with a working network connection
 	# so only show it on network installs for now
-	if [[ $setup_type == 'network' ]]; then
-		install_type=$(whiptail --title "$whiptail_title" --radiolist \
+	install_type=$(whiptail --title "$whiptail_title" --radiolist \
 		"Choose node type:" 9 65 2 \
-			"ANALYST" "Setup will run 'so-setup analyst' " ON \
-			"HELIXSENSOR" "Create a Helix sensor " OFF \
-			3>&1 1>&2 2>&3
+		"ANALYST" "Setup will run 'so-setup analyst' " ON \
+		"HELIXSENSOR" "Create a Helix sensor " OFF \
+		3>&1 1>&2 2>&3
 		)
-	else
-		install_type=$(whiptail --title "$whiptail_title" --radiolist \
-		"Choose node type:" 8 65 1 \
-			"HELIXSENSOR" "Create a Helix sensor " ON \
-			3>&1 1>&2 2>&3
-		)
-	fi
-
+	
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus