diff --git a/apiserver/plane/license/utils/instance_value.py b/apiserver/plane/license/utils/instance_value.py
index f26724183..e56525893 100644
--- a/apiserver/plane/license/utils/instance_value.py
+++ b/apiserver/plane/license/utils/instance_value.py
@@ -41,17 +41,17 @@ def get_email_configuration():
     return (
         get_configuration_value(
             [
+                {
+                    "key": "EMAIL_HOST",
+                    "default": os.environ.get("EMAIL_HOST"),
+                },
                 {
                     "key": "EMAIL_HOST_USER",
-                    "default": os.environ.get("EMAIL_HOST_USER", None),
+                    "default": os.environ.get("EMAIL_HOST_USER"),
                 },
                 {
                     "key": "EMAIL_HOST_PASSWORD",
-                    "default": os.environ.get("EMAIL_HOST_PASSWORD", None),
-                },
-                {
-                    "key": "EMAIL_HOST",
-                    "default": os.environ.get("EMAIL_HOST", None),
+                    "default": os.environ.get("EMAIL_HOST_PASSWORD"),
                 },
                 {
                     "key": "EMAIL_PORT",