diff --git a/custom_components/remote_homeassistant/config_flow.py b/custom_components/remote_homeassistant/config_flow.py
index 1d084fb..124c405 100644
--- a/custom_components/remote_homeassistant/config_flow.py
+++ b/custom_components/remote_homeassistant/config_flow.py
@@ -238,7 +238,7 @@ async def async_step_init(self, user_input=None):
                         default=self._default(CONF_LOAD_COMPONENTS),
                     ): cv.multi_select(sorted(domains)),
                     vol.Required(
-                        CONF_SERVICE_PREFIX, default=slugify(self.config_entry.title)
+                        CONF_SERVICE_PREFIX, default=self.config_entry.options.get(CONF_SERVICE_PREFIX) or slugify(self.config_entry.title)
                     ): str,
                     vol.Optional(
                         CONF_SERVICES,