diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46f449e75..26c210480 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
  - Minor visual improvements on Evil Twin's captive portal
  - Improvement on command line while capturing PMKID. Now, faster performance and less default timeout (Thank you to "alexl83")
  - Fixed bug on view after a failed asleap attack from offline decryption menu
+ - Fixed issue on default_choice in capture_traps function
 
 ### 11.30
  - Added Multi-instance support to launch more than one airgeddon at a time
diff --git a/airgeddon.sh b/airgeddon.sh
index 0027c7769..076e33ccd 100755
--- a/airgeddon.sh
+++ b/airgeddon.sh
@@ -14637,11 +14637,27 @@ function capture_traps() {
 						exit_script_option
 					;;
 					*)
+						local previous_default_choice="${default_choice}"
 						ask_yesno 12 "yes"
 						if [ "${yesno}" = "y" ]; then
 							exit_code=1
 							exit_script_option
 						else
+							if [ -n "${previous_default_choice}" ]; then
+								default_choice="${previous_default_choice}"
+								case ${previous_default_choice^^} in
+									"Y"|"YES")
+										visual_choice="[Y/n]"
+									;;
+									"N"|"NO")
+										visual_choice="[y/N]"
+									;;
+									"")
+										visual_choice="[y/n]"
+									;;
+								esac
+							fi
+
 							language_strings "${language}" 224 "blue"
 							if [ "${last_buffered_type1}" = "read" ]; then
 								language_strings "${language}" "${last_buffered_message2}" "${last_buffered_type2}"