diff --git a/setup/so-functions b/setup/so-functions
index e6fd36044..bb1db565a 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -2332,6 +2332,8 @@ verify_setup() {
 	result=$?
 	set +o pipefail
 	if [[ $result -eq 0 ]]; then
+		# Remove ISO sudoers entry if present
+                sed -i '/so-setup/d' /etc/sudoers
 		whiptail_setup_complete
 	else
 		whiptail_setup_failed