diff --git a/app/email_queue/email_queue_edit.php b/app/email_queue/email_queue_edit.php
index 0e53b1856a..69420b5d7f 100644
--- a/app/email_queue/email_queue_edit.php
+++ b/app/email_queue/email_queue_edit.php
@@ -518,7 +518,7 @@
 	echo "</td>\n";
 	echo "</tr>\n";
 
-	if (filter_var($_SESSION['email_queue']['save_response']['boolean'] ?? false, FILTER_VALIDATE_BOOL)) {
+	if ($settings->get('Emai', 'save_response')) {
 		echo "<tr>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 		echo "	".$text['label-email_response']."\n";
@@ -576,4 +576,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/email_queue/resources/jobs/email_send.php b/app/email_queue/resources/jobs/email_send.php
index a0b3f8d213..92b1d0550a 100755
--- a/app/email_queue/resources/jobs/email_send.php
+++ b/app/email_queue/resources/jobs/email_send.php
@@ -156,7 +156,7 @@
 //get the email settings
 	$retry_limit = $settings->get('email_queue', 'retry_limit');
 	$transcribe_enabled = $settings->get('transcribe', 'enabled', false);
-	$save_response = $settings->get('email_queue', 'save_response');
+	$save_response = $settings->get('email_queue', 'save_response', false);
 
 //set defaults
 	if (empty($email_retry_count)) {
@@ -368,7 +368,7 @@
 			$parameters['email_body'] = $email_body;
 			$parameters['email_transcription'] = $transcribe_message;
 		}
-		if (isset($save_response) && $save_response == 'true') {
+		if ($save_response) {
 			$sql .= "email_response = :email_response, ";
 			$parameters['email_response'] = $email_settings."\n".$email_response;
 		}