diff --git a/modules/cloonar-assistant/home-assistant/default.nix b/modules/cloonar-assistant/home-assistant/default.nix
index 2fe44e4..9adf035 100644
--- a/modules/cloonar-assistant/home-assistant/default.nix
+++ b/modules/cloonar-assistant/home-assistant/default.nix
@@ -7,7 +7,13 @@ let
     rev = "18dd725c29603f582cf1900e0d25f9f1063dbf11";
   }) {};
 
-  home-assistant-config = lib.recursiveUpdate config.services.home-assistant {
+  haOld = config.services.home-assistant;
+  # 2) If it still has the removed key, drop it:
+  haClean = if builtins.hasAttr "autoExtraComponents" haOld
+    then builtins.removeAttrs haOld [ "autoExtraComponents" ]
+    else haOld;
+
+  home-assistant-config = lib.recursiveUpdate haClean {
     package = pkgs-with-home-assistant.home-assistant;
     extraComponents = [
       "mobile_app"