diff --git a/custom_components/mass_queue/config_flow.py b/custom_components/mass_queue/config_flow.py
index e38d588..6615df2 100644
--- a/custom_components/mass_queue/config_flow.py
+++ b/custom_components/mass_queue/config_flow.py
@@ -69,7 +69,10 @@ def _parse_zeroconf_server_info(properties: dict[str, str]) -> ServerInfoMessage
 
 def get_manual_schema(user_input: dict[str, Any]) -> vol.Schema:
     """Return a schema for the manual step."""
-    default_url = user_input.get(CONF_URL, DEFAULT_URL)
+    if type(user_input) is dict:
+        default_url = user_input.get(CONF_URL, DEFAULT_URL)
+    else:
+        default_url = DEFAULT_URL
     return vol.Schema(
         {
             vol.Required(CONF_URL, default=default_url): str,
@@ -145,12 +148,14 @@ async def async_step_user(
         if suggested_values is None:
             suggested_values = {CONF_URL: DEFAULT_URL}
 
+        form = get_manual_schema(user_input)
+        schema = self.add_suggested_values_to_schema(
+            form,
+            suggested_values,
+        )
         return self.async_show_form(
             step_id="user",
-            data_schema=self.add_suggested_values_to_schema(
-                get_manual_schema(user_input),
-                suggested_values,
-            ),
+            data_schema=schema,
             errors=errors,
         )
 
diff --git a/custom_components/mass_queue/controller.py b/custom_components/mass_queue/controller.py
index 088f490..d4d5fec 100644
--- a/custom_components/mass_queue/controller.py
+++ b/custom_components/mass_queue/controller.py
@@ -229,7 +229,7 @@ async def get_queue(
 
     async def get_active_queue(self, queue_id: str):
         """Get the active queue for a single queue."""
-        return await self._client.get_active_queue(queue_id)
+        return await self._client.player_queues.get_active_queue(queue_id)
 
     async def get_queue_index(self, queue_id: str):
         """Get the active queue index for a single queue."""
diff --git a/custom_components/mass_queue/manifest.json b/custom_components/mass_queue/manifest.json
index cac01e0..de31fdd 100644
--- a/custom_components/mass_queue/manifest.json
+++ b/custom_components/mass_queue/manifest.json
@@ -11,6 +11,6 @@
   "issue_tracker": "https://github.com/droans/mass_queue/issues",
   "requirements": ["music-assistant-client"],
   "ssdp": [],
-  "version": "0.9.0",
+  "version": "0.9.1",
   "zeroconf": ["_mass._tcp.local."]
 }
diff --git a/hacs.json b/hacs.json
index 9819fbc..2a28ecc 100644
--- a/hacs.json
+++ b/hacs.json
@@ -1,5 +1,6 @@
 {
   "name": "Music Assistant Queue Actions",
+  "homeassistant": "2025.12",
   "render_readme": true,
   "zip_release": false
 }