diff --git a/app/Http/Controllers/V1/Admin/Settings/MailConfigurationController.php b/app/Http/Controllers/V1/Admin/Settings/MailConfigurationController.php
index 335dd2a0..9b47211e 100755
--- a/app/Http/Controllers/V1/Admin/Settings/MailConfigurationController.php
+++ b/app/Http/Controllers/V1/Admin/Settings/MailConfigurationController.php
@@ -50,7 +50,7 @@ class MailConfigurationController extends Controller
             'mail_port' => config('mail.port'),
             'mail_username' => config('mail.username'),
             'mail_password' => config('mail.password'),
-            'mail_encryption' => config('mail.encryption'),
+            'mail_encryption' => is_null(config('mail.encryption')) ? 'none' : config('mail.encryption'),
             'from_name' => config('mail.from.name'),
             'from_mail' => config('mail.from.address'),
             'mail_mailgun_endpoint' => config('services.mailgun.endpoint'),
diff --git a/app/Space/EnvironmentManager.php b/app/Space/EnvironmentManager.php
index 17b6bd1f..5795b922 100755
--- a/app/Space/EnvironmentManager.php
+++ b/app/Space/EnvironmentManager.php
@@ -255,7 +255,7 @@ class EnvironmentManager
                     'MAIL_PORT' => $request->get('mail_port'),
                     'MAIL_USERNAME' => $request->get('mail_username'),
                     'MAIL_PASSWORD' => $request->get('mail_password'),
-                    'MAIL_ENCRYPTION' => $request->get('mail_encryption'),
+                    'MAIL_ENCRYPTION' => $request->get('mail_encryption') !== 'none' ? $request->get('mail_encryption') : 'null',
                     'MAIL_FROM_ADDRESS' => $request->get('from_mail'),
                     'MAIL_FROM_NAME' => $request->get('from_name'),
                 ];
diff --git a/resources/scripts/admin/views/installation/mail-driver/SmtpMailDriver.vue b/resources/scripts/admin/views/installation/mail-driver/SmtpMailDriver.vue
index d5860f12..0833a0a3 100644
--- a/resources/scripts/admin/views/installation/mail-driver/SmtpMailDriver.vue
+++ b/resources/scripts/admin/views/installation/mail-driver/SmtpMailDriver.vue
@@ -200,7 +200,7 @@ const props = defineProps({
 const emit = defineEmits(['submit-data', 'on-change-driver'])
 
 let isShowPassword = ref(false)
-const encryptions = reactive(['tls', 'ssl', 'starttls'])
+const encryptions = reactive(['none', 'tls', 'ssl', 'starttls'])
 const { t } = useI18n()
 
 const mailDriverStore = useMailDriverStore()
diff --git a/resources/scripts/admin/views/settings/mail-driver/SmtpMailDriver.vue b/resources/scripts/admin/views/settings/mail-driver/SmtpMailDriver.vue
index dbb947f2..d781aed9 100644
--- a/resources/scripts/admin/views/settings/mail-driver/SmtpMailDriver.vue
+++ b/resources/scripts/admin/views/settings/mail-driver/SmtpMailDriver.vue
@@ -211,7 +211,7 @@ const mailDriverStore = useMailDriverStore()
 const { t } = useI18n()
 
 let isShowPassword = ref(false)
-const encryptions = reactive(['tls', 'ssl', 'starttls'])
+const encryptions = reactive(['none','tls', 'ssl', 'starttls'])
 
 const getInputType = computed(() => {
   if (isShowPassword.value) {