diff --git a/setup/so-setup b/setup/so-setup
index 6242d4a14..37004e9e6 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -633,3 +633,6 @@ fi
 if [[ -z $SKIP_REBOOT ]]; then
 	shutdown -r now
 fi
+
+install_cleanup >> $setup_log 2>&1
+
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 8c84d5345..e165ba351 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -1036,17 +1036,13 @@ whiptail_setup_complete() {
 	[ -n "$TESTING" ] && return
 
 	whiptail --title "Security Onion Setup" --msgbox "Finished $install_type install. Press Ok to reboot." 8 75
-	install_cleanup >> $setup_log 2>&1
-
 }
 
 whiptail_setup_failed() {
 
 	[ -n "$TESTING" ] && return
 
-	whiptail --title "Security Onion Setup" --msgbox "Install had a problem. Please see $setup_log for details. Press Ok to reboot." 8 75
-	install_cleanup >> $setup_log 2>&1
-
+	whiptail --title "Security Onion Setup" --msgbox "Install had a problem. Please see $setup_log for details. Press Ok to exit." 8 75
 }
 
 whiptail_shard_count() {