diff --git a/custom_components/mail_and_packages/config_flow.py b/custom_components/mail_and_packages/config_flow.py
index 24d35f91..fa3ca365 100644
--- a/custom_components/mail_and_packages/config_flow.py
+++ b/custom_components/mail_and_packages/config_flow.py
@@ -418,6 +418,7 @@ async def _show_config_amazon(self, user_input):
         """Step 3 setup."""
         # Defaults
         defaults = {
+            CONF_AMAZON_DOMAIN: DEFAULT_AMAZON_DOMAIN,
             CONF_AMAZON_FWDS: DEFAULT_AMAZON_FWDS,
             CONF_AMAZON_DAYS: DEFAULT_AMAZON_DAYS,
         }
@@ -552,15 +553,8 @@ async def async_step_reconfig_amazon(self, user_input=None):
 
     async def _show_reconfig_amazon(self, user_input):
         """Step 3 setup."""
-        # Defaults
-        defaults = {
-            CONF_AMAZON_DOMAIN: DEFAULT_AMAZON_DOMAIN,
-            CONF_AMAZON_FWDS: DEFAULT_AMAZON_FWDS,
-            CONF_AMAZON_DAYS: DEFAULT_AMAZON_DAYS,
-        }
-
         return self.async_show_form(
             step_id="reconfig_amazon",
-            data_schema=_get_schema_step_amazon(user_input, defaults),
+            data_schema=_get_schema_step_amazon(user_input, self._data),
             errors=self._errors,
         )