diff --git a/supervisor/api/homeassistant.py b/supervisor/api/homeassistant.py
index c2b85c1e5..33d1a804b 100644
--- a/supervisor/api/homeassistant.py
+++ b/supervisor/api/homeassistant.py
@@ -43,7 +43,7 @@ _LOGGER: logging.Logger = logging.getLogger(__name__)
 SCHEMA_OPTIONS = vol.Schema(
     {
         vol.Optional(ATTR_BOOT): vol.Boolean(),
-        vol.Optional(ATTR_IMAGE): docker_image,
+        vol.Optional(ATTR_IMAGE): vol.Maybe(docker_image),
         vol.Optional(ATTR_PORT): network_port,
         vol.Optional(ATTR_SSL): vol.Boolean(),
         vol.Optional(ATTR_WATCHDOG): vol.Boolean(),
diff --git a/supervisor/homeassistant/module.py b/supervisor/homeassistant/module.py
index d6d4f9a41..3ae85156a 100644
--- a/supervisor/homeassistant/module.py
+++ b/supervisor/homeassistant/module.py
@@ -156,7 +156,7 @@ class HomeAssistant(FileConfiguration, CoreSysAttributes):
         return f"ghcr.io/home-assistant/{self.sys_machine}-homeassistant"
 
     @image.setter
-    def image(self, value: str) -> None:
+    def image(self, value: Optional[str]) -> None:
         """Set image name of Home Assistant container."""
         self._data[ATTR_IMAGE] = value
 
@@ -201,7 +201,7 @@ class HomeAssistant(FileConfiguration, CoreSysAttributes):
         return self._data.get(ATTR_REFRESH_TOKEN)
 
     @refresh_token.setter
-    def refresh_token(self, value: str):
+    def refresh_token(self, value: Optional[str]):
         """Set Home Assistant refresh_token."""
         self._data[ATTR_REFRESH_TOKEN] = value