diff --git a/README.md b/README.md
index ba5d907..ad44d94 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Bodhi supports multiple AI providers that can be switched via configuration.
 
 #### OpenRouter (Default)
 - **Module:** `Bodhi.OpenRouter`
-- **Default Model:** `deepseek/deepseek-r1-0528:free`
+- **Default Model:** `openrouter/free` (when no model is selected in admin)
 - **Environment Variable:** `OPENROUTER_API_KEY`
 - **Website:** https://openrouter.ai/
 
@@ -33,10 +33,10 @@ To switch AI providers, update `config/config.exs`:
 
 ```elixir
 # Use OpenRouter (default)
-config :bodhi, :ai_client, Bodhi.OpenRouter
+config :bodhi, :llm_provider, Bodhi.OpenRouter
 
 # Use Google Gemini
-config :bodhi, :ai_client, Bodhi.Gemini
+config :bodhi, :llm_provider, Bodhi.Gemini
 ```
 
 ### Setting Up API Keys
@@ -51,21 +51,13 @@ config :bodhi, :ai_client, Bodhi.Gemini
 
 3. Reload environment: `direnv allow` (if using direnv)
 
-### Changing OpenRouter Model
+### Selecting an OpenRouter Model
 
-Edit `lib/bodhi/open_router.ex` and modify the `@default_model` attribute:
-
-```elixir
-@default_model "deepseek/deepseek-r1-0528:free"  # Current default
-
-# Other popular models:
-# @default_model "anthropic/claude-3.5-sonnet"
-# @default_model "openai/gpt-4-turbo"
-# @default_model "meta-llama/llama-3.1-70b-instruct"
-# @default_model "google/gemini-pro-1.5"
-```
-
-See all available models at: https://openrouter.ai/models
+In the admin UI, open **LLM Configurations**, choose **Sync Models** to
+load available OpenRouter models, then edit a model to set optional
+temperature and max token values. Choose **Use this model** to select one
+model for the bot. Choose **Use default model** to clear the selection and
+return to `openrouter/free`.
 
 ## Features
 
diff --git a/lib/bodhi/llm_configs.ex b/lib/bodhi/llm_configs.ex
index 4e76843..5bda932 100644
--- a/lib/bodhi/llm_configs.ex
+++ b/lib/bodhi/llm_configs.ex
@@ -9,8 +9,8 @@ defmodule Bodhi.LlmConfigs do
   import Ecto.Query, warn: false
 
   alias Bodhi.Cache
-  alias Bodhi.Repo
   alias Bodhi.LlmConfigs.LlmConfig
+  alias Bodhi.Repo
 
   @cache_key :active_llm_configs
 
@@ -45,7 +45,7 @@ defmodule Bodhi.LlmConfigs do
   def get_llm_config!(id), do: Repo.get!(LlmConfig, id)
 
   @doc """
-  Returns all active configs ordered by position.
+  Returns the selected model as a list of zero or one records.
   """
   @spec get_active_configs() :: [LlmConfig.t()]
   def get_active_configs do
@@ -55,12 +55,62 @@ defmodule Bodhi.LlmConfigs do
     |> Repo.all()
   end
 
+  @doc "Selects a model and clears any previous selection."
+  @spec select_llm_config(non_neg_integer()) ::
+          {:ok, LlmConfig.t()} | {:error, Ecto.Changeset.t()}
+  def select_llm_config(id) do
+    result = Repo.transaction(fn -> select_config_in_transaction(id) end)
+
+    case result do
+      {:ok, config} ->
+        invalidate_cache()
+        {:ok, config}
+
+      {:error, changeset} ->
+        {:error, changeset}
+    end
+  end
+
+  defp select_config_in_transaction(id) do
+    Repo.update_all(LlmConfig, set: [active: false])
+
+    case Repo.get(LlmConfig, id) do
+      nil ->
+        Repo.rollback(
+          LlmConfig.changeset(%LlmConfig{}, %{})
+          |> Ecto.Changeset.add_error(:id, "model does not exist")
+        )
+
+      config ->
+        config
+        |> Ecto.Changeset.change(active: true)
+        |> Ecto.Changeset.unique_constraint(
+          :active,
+          name: :llm_configs_one_active_index
+        )
+        |> Repo.update()
+        |> rollback_on_error()
+    end
+  end
+
+  defp rollback_on_error({:ok, config}), do: config
+  defp rollback_on_error({:error, changeset}), do: Repo.rollback(changeset)
+
+  @doc "Clears the selected model so OpenRouter uses its default."
+  @spec clear_llm_config_selection() :: :ok
+  def clear_llm_config_selection do
+    Repo.update_all(LlmConfig, set: [active: false])
+    invalidate_cache()
+  end
+
   @doc """
   Creates an LLM config.
   """
   @spec create_llm_config(map()) ::
           {:ok, LlmConfig.t()} | {:error, Ecto.Changeset.t()}
   def create_llm_config(attrs) do
+    attrs = Map.drop(attrs, [:active, "active"])
+
     result =
       %LlmConfig{}
       |> LlmConfig.changeset(attrs)
@@ -76,13 +126,15 @@ defmodule Bodhi.LlmConfigs do
   @spec update_llm_config(LlmConfig.t(), map()) ::
           {:ok, LlmConfig.t()} | {:error, Ecto.Changeset.t()}
   def update_llm_config(%LlmConfig{} = config, attrs) do
+    attrs = Map.drop(attrs, [:active, "active"])
+
     result =
       config
       |> LlmConfig.changeset(attrs)
       |> Repo.update()
 
     with {:ok, _} <- result do
-      if config.active || touches_active?(attrs) do
+      if config.active do
         invalidate_cache()
       end
     end
@@ -251,16 +303,6 @@ defmodule Bodhi.LlmConfigs do
     ArgumentError -> :position
   end
 
-  defp maybe_invalidate_cache({:ok, _}, attrs) do
-    if touches_active?(attrs), do: invalidate_cache()
-  end
-
-  defp maybe_invalidate_cache(_, _), do: :ok
-
-  defp touches_active?(attrs) do
-    active =
-      Map.get(attrs, :active) || Map.get(attrs, "active")
-
-    active == true
-  end
+  defp maybe_invalidate_cache({:ok, _}, _attrs), do: :ok
+  defp maybe_invalidate_cache({:error, _}, _attrs), do: :ok
 end
diff --git a/lib/bodhi/llm_configs/llm_config.ex b/lib/bodhi/llm_configs/llm_config.ex
index 1313235..ac38712 100644
--- a/lib/bodhi/llm_configs/llm_config.ex
+++ b/lib/bodhi/llm_configs/llm_config.ex
@@ -2,18 +2,15 @@ defmodule Bodhi.LlmConfigs.LlmConfig do
   @moduledoc """
   Schema for LLM model configurations.
 
-  Each config represents a model that can be used via
-  OpenRouter. Multiple configs can be active simultaneously
-  -- their `position` determines fallback order (lower =
-  higher priority). Active configs are sent as OpenRouter's
-  `models` array with `route: "fallback"`.
+  Each config represents an OpenRouter model. At most one
+  configuration can be active at a time.
   """
 
   use Ecto.Schema
   import Ecto.Changeset
 
   @allowed_fields ~w(
-    name model position temperature max_tokens active
+    name model position temperature max_tokens
   )a
 
   @required_fields ~w(name model position)a
diff --git a/lib/bodhi/open_router.ex b/lib/bodhi/open_router.ex
index c8bbe7f..15741ae 100644
--- a/lib/bodhi/open_router.ex
+++ b/lib/bodhi/open_router.ex
@@ -2,10 +2,8 @@ defmodule Bodhi.OpenRouter do
   @moduledoc """
   OpenRouter API wrapper.
 
-  Provides unified access to multiple AI models through
-  OpenAI-compatible API. Supports database-backed model
-  configuration with multi-model fallback via OpenRouter's
-  `models` array and `route: "fallback"`.
+  Provides access to a selected OpenRouter model through its
+  OpenAI-compatible API, with `openrouter/free` as the default.
   """
   @behaviour Bodhi.Behaviours.LLMProvider
 
@@ -70,7 +68,7 @@ defmodule Bodhi.OpenRouter do
   Returns active LLM configs from cache or database.
 
   Results are cached for 5 minutes. Returns an empty list
-  when no active configs exist (falls back to default model).
+  when no model is selected (falls back to the default model).
   """
   @spec resolve_config() :: [LlmConfig.t()]
   def resolve_config do
@@ -88,11 +86,8 @@ defmodule Bodhi.OpenRouter do
   @doc """
   Builds the JSON request body for OpenRouter.
 
-  - Single active model: uses `model` key
-  - Multiple active models: uses `models` array +
-    `route: "fallback"`
-  - No DB config: uses `@default_model`
-  - Temperature/max_tokens from highest-priority config
+  Uses the selected model and its optional parameters, or the
+  default model when no configuration is selected.
   """
   @spec build_body([map()], String.t(), [LlmConfig.t()]) ::
           String.t()
@@ -140,17 +135,12 @@ defmodule Bodhi.OpenRouter do
     Map.put(body, :model, @default_model)
   end
 
-  defp put_model_config(body, [single]) do
-    Map.put(body, :model, single.model)
+  defp put_model_config(body, [selected | _]) do
+    Map.put(body, :model, selected.model)
   end
 
-  defp put_model_config(body, configs) do
-    models = Enum.map(configs, & &1.model)
-
-    body
-    |> Map.put(:models, models)
-    |> Map.put(:route, "fallback")
-  end
+  defp put_model_config(body, _configs),
+    do: Map.put(body, :model, @default_model)
 
   defp put_optional_params(body, []) do
     body
diff --git a/lib/bodhi_web.ex b/lib/bodhi_web.ex
index 2ee9532..2c0dcc5 100644
--- a/lib/bodhi_web.ex
+++ b/lib/bodhi_web.ex
@@ -89,8 +89,8 @@ defmodule BodhiWeb do
       import BodhiWeb.Components.Seo
 
       # Common modules used in templates
-      alias Phoenix.LiveView.JS
       alias BodhiWeb.Layouts
+      alias Phoenix.LiveView.JS
 
       # Routes generation with the ~p sigil
       unquote(verified_routes())
diff --git a/lib/bodhi_web/live/llm_config_live/form.ex b/lib/bodhi_web/live/llm_config_live/form.ex
index 8ec2559..e4e9585 100644
--- a/lib/bodhi_web/live/llm_config_live/form.ex
+++ b/lib/bodhi_web/live/llm_config_live/form.ex
@@ -48,11 +48,9 @@ defmodule BodhiWeb.LlmConfigLive.Form do
           type="number"
           label="Max Tokens"
         />
-        <.input
-          field={@form[:active]}
-          type="checkbox"
-          label="Active"
-        />
+        <p class="my-4 text-sm text-zinc-500">
+          Save this model, then select it from the model list.
+        </p>
         <footer>
           <.button phx-disable-with="Saving..." variant="primary">
             Save Config
diff --git a/lib/bodhi_web/live/llm_config_live/index.ex b/lib/bodhi_web/live/llm_config_live/index.ex
index 3db155c..9d7cd34 100644
--- a/lib/bodhi_web/live/llm_config_live/index.ex
+++ b/lib/bodhi_web/live/llm_config_live/index.ex
@@ -38,6 +38,21 @@ defmodule BodhiWeb.LlmConfigLive.Index do
         </:actions>
       </.header>
 
+      <section id="current-model" class="my-4 rounded-lg border p-4">
+        <h2 class="font-semibold">Current model</h2>
+        <p :if={@selected_model}>
+          {@selected_model.name} ({@selected_model.model})
+        </p>
+        <p :if={!@selected_model}>Default model: openrouter/free</p>
+        <button
+          :if={@selected_model}
+          id="clear-model-selection"
+          type="button"
+          phx-click="clear_selection"
+          class="underline"
+        >Use default model</button>
+      </section>
+
       <div class="flex items-center gap-4 my-4">
         <form
           id="filter-form"
@@ -161,7 +176,7 @@ defmodule BodhiWeb.LlmConfigLive.Index do
                     )
                   ]}>
                     {if cfg.active,
-                      do: "Active",
+                      do: "Selected",
                       else: "Inactive"}
                   </span>
                 </div>
@@ -174,12 +189,12 @@ defmodule BodhiWeb.LlmConfigLive.Index do
                     Edit
                   </.link>
                   <.link
-                    phx-click="toggle_active"
+                    :if={!cfg.active}
+                    id={"select-model-#{cfg.id}"}
+                    phx-click="select_model"
                     phx-value-id={cfg.id}
                   >
-                    {if cfg.active,
-                      do: "Deactivate",
-                      else: "Activate"}
+                    Use this model
                   </.link>
                   <.link
                     phx-click={
@@ -241,6 +256,7 @@ defmodule BodhiWeb.LlmConfigLive.Index do
      |> assign(:page, %{title: "LLM Configurations"})
      |> assign(:syncing, false)
      |> assign(:params, @default_params)
+     |> assign(:selected_model, List.first(LlmConfigs.get_active_configs()))
      |> apply_filters()}
   end
 
@@ -318,18 +334,44 @@ defmodule BodhiWeb.LlmConfigLive.Index do
     config = LlmConfigs.get_llm_config!(id)
     {:ok, _} = LlmConfigs.delete_llm_config(config)
 
-    {:noreply, apply_filters(socket)}
+    selected_model =
+      if socket.assigns.selected_model &&
+           socket.assigns.selected_model.id == config.id do
+        nil
+      else
+        socket.assigns.selected_model
+      end
+
+    {:noreply,
+     socket
+     |> assign(:selected_model, selected_model)
+     |> apply_filters()}
   end
 
-  def handle_event("toggle_active", %{"id" => id}, socket) do
-    config = LlmConfigs.get_llm_config!(id)
+  def handle_event("select_model", %{"id" => id}, socket) do
+    case LlmConfigs.select_llm_config(String.to_integer(id)) do
+      {:ok, config} ->
+        {:noreply,
+         socket
+         |> assign(:selected_model, config)
+         |> apply_filters()
+         |> put_flash(:info, "#{config.name} selected")}
 
-    {:ok, _updated} =
-      LlmConfigs.update_llm_config(config, %{
-        active: !config.active
-      })
+      {:error, changeset} ->
+        {:noreply,
+         put_flash(socket, :error, "Could not select model: #{inspect(changeset.errors)}")}
+    end
+  end
 
-    {:noreply, apply_filters(socket)}
+  def handle_event("clear_selection", _params, socket) do
+    case LlmConfigs.clear_llm_config_selection() do
+      :ok ->
+        {:noreply,
+         socket
+         |> assign(:selected_model, nil)
+         |> apply_filters()
+         |> put_flash(:info, "Using the default model")}
+    end
   end
 
   defp apply_filters(socket) do
diff --git a/priv/repo/migrations/20260925054142_enforce_single_active_llm_config.exs b/priv/repo/migrations/20260925054142_enforce_single_active_llm_config.exs
new file mode 100644
index 0000000..aec2420
--- /dev/null
+++ b/priv/repo/migrations/20260925054142_enforce_single_active_llm_config.exs
@@ -0,0 +1,26 @@
+defmodule Bodhi.Repo.Migrations.EnforceSingleActiveLlmConfig do
+  use Ecto.Migration
+
+  def up do
+    execute """
+    UPDATE llm_configs
+    SET active = false
+    WHERE active = true
+      AND id NOT IN (
+        SELECT id FROM llm_configs
+        WHERE active = true
+        ORDER BY position ASC, id ASC
+        LIMIT 1
+      )
+    """
+
+    create unique_index(:llm_configs, [:active],
+             where: "active = true",
+             name: :llm_configs_one_active_index
+           )
+  end
+
+  def down do
+    drop_if_exists index(:llm_configs, [:active], name: :llm_configs_one_active_index)
+  end
+end
diff --git a/test/bodhi/llm_configs_test.exs b/test/bodhi/llm_configs_test.exs
index e8b612c..8d4421c 100644
--- a/test/bodhi/llm_configs_test.exs
+++ b/test/bodhi/llm_configs_test.exs
@@ -1,9 +1,9 @@
 defmodule Bodhi.LlmConfigsTest do
   use Bodhi.DataCase, async: false
 
+  alias Bodhi.Cache
   alias Bodhi.LlmConfigs
   alias Bodhi.LlmConfigs.LlmConfig
-  alias Bodhi.Cache
 
   setup do
     Cache.delete_all()
@@ -170,7 +170,7 @@ defmodule Bodhi.LlmConfigsTest do
       _wrong_name =
         insert(:llm_config,
           name: "Claude",
-          active: true,
+          active: false,
           position: 2
         )
 
@@ -184,12 +184,11 @@ defmodule Bodhi.LlmConfigsTest do
     end
 
     test "combines filters with sort" do
-      b =
-        insert(:llm_config,
-          name: "Beta-GPT",
-          active: true,
-          position: 0
-        )
+      insert(:llm_config,
+        name: "Beta-GPT",
+        active: false,
+        position: 0
+      )
 
       a =
         insert(:llm_config,
@@ -213,7 +212,7 @@ defmodule Bodhi.LlmConfigsTest do
           "sort_dir" => "asc"
         })
 
-      assert Enum.map(result, & &1.id) == [a.id, b.id]
+      assert Enum.map(result, & &1.id) == [a.id]
     end
   end
 
@@ -233,13 +232,12 @@ defmodule Bodhi.LlmConfigsTest do
   describe "get_active_configs/0" do
     test "returns only active configs ordered by position" do
       insert(:llm_config, active: false, position: 0)
-      a1 = insert(:llm_config, active: true, position: 2)
+      insert(:llm_config, active: false, position: 2)
       a0 = insert(:llm_config, active: true, position: 1)
 
       result = LlmConfigs.get_active_configs()
 
-      assert length(result) == 2
-      assert Enum.map(result, & &1.id) == [a0.id, a1.id]
+      assert Enum.map(result, & &1.id) == [a0.id]
     end
 
     test "returns empty list when no active configs" do
@@ -248,6 +246,38 @@ defmodule Bodhi.LlmConfigsTest do
     end
   end
 
+  describe "select_llm_config/1" do
+    test "selects one configuration and invalidates the provider cache" do
+      previous = insert(:llm_config, active: true)
+      candidate = insert(:llm_config, active: false)
+      Cache.put(:active_llm_configs, [previous])
+
+      assert {:ok, selected} = LlmConfigs.select_llm_config(candidate.id)
+      assert selected.id == candidate.id
+      refute LlmConfigs.get_llm_config!(previous.id).active
+      assert LlmConfigs.get_active_configs() == [selected]
+      assert Cache.get(:active_llm_configs) == nil
+    end
+
+    test "returns a changeset when the configuration is missing" do
+      selected = insert(:llm_config, active: true)
+
+      assert {:error, %Ecto.Changeset{}} =
+               LlmConfigs.select_llm_config(-1)
+
+      assert LlmConfigs.get_active_configs() == [selected]
+    end
+
+    test "clears the selection to restore the provider default" do
+      insert(:llm_config, active: true)
+      Cache.put(:active_llm_configs, [:stale])
+
+      assert :ok = LlmConfigs.clear_llm_config_selection()
+      assert LlmConfigs.get_active_configs() == []
+      assert Cache.get(:active_llm_configs) == nil
+    end
+  end
+
   describe "create_llm_config/1" do
     test "with valid data creates a config" do
       attrs = params_for(:llm_config, name: "new-config")
@@ -273,7 +303,7 @@ defmodule Bodhi.LlmConfigsTest do
                errors_on(changeset)
     end
 
-    test "invalidates cache when creating active config" do
+    test "creation cannot select a model" do
       Cache.put(:active_llm_configs, [])
 
       attrs =
@@ -281,7 +311,7 @@ defmodule Bodhi.LlmConfigsTest do
 
       {:ok, _} = LlmConfigs.create_llm_config(attrs)
 
-      assert Cache.get(:active_llm_configs) == nil
+      assert Cache.get(:active_llm_configs) == []
     end
 
     test "does not invalidate cache for inactive config" do
@@ -315,14 +345,15 @@ defmodule Bodhi.LlmConfigsTest do
                })
     end
 
-    test "invalidates cache when toggling active" do
+    test "updates cannot select a model" do
       config = insert(:llm_config, active: false)
       Cache.put(:active_llm_configs, [])
 
       {:ok, _} =
         LlmConfigs.update_llm_config(config, %{active: true})
 
-      assert Cache.get(:active_llm_configs) == nil
+      assert Cache.get(:active_llm_configs) == []
+      refute LlmConfigs.get_llm_config!(config.id).active
     end
 
     test "invalidates cache when updating active config" do
@@ -418,7 +449,7 @@ defmodule Bodhi.LlmConfigsTest do
       kept =
         insert(:llm_config,
           model: "openai/gpt-4o",
-          active: true
+          active: false
         )
 
       remote = [
@@ -432,7 +463,7 @@ defmodule Bodhi.LlmConfigsTest do
                false
 
       assert LlmConfigs.get_llm_config!(kept.id).active ==
-               true
+               false
     end
 
     test "handles name collision by falling back to model id" do
@@ -468,9 +499,8 @@ defmodule Bodhi.LlmConfigsTest do
 
     test "handles empty remote list by deactivating all" do
       insert(:llm_config, active: true)
-      insert(:llm_config, active: true)
 
-      assert {:ok, %{created: 0, deactivated: 2}} =
+      assert {:ok, %{created: 0, deactivated: 1}} =
                LlmConfigs.sync_models([])
     end
   end
diff --git a/test/bodhi/open_router_test.exs b/test/bodhi/open_router_test.exs
index 7849e17..2678c8e 100644
--- a/test/bodhi/open_router_test.exs
+++ b/test/bodhi/open_router_test.exs
@@ -21,19 +21,17 @@ defmodule Bodhi.OpenRouterTest do
           max_tokens: 4096
         )
 
-      c2 =
-        insert(:llm_config,
-          active: true,
-          position: 1,
-          model: "anthropic/claude-3.5-sonnet"
-        )
+      insert(:llm_config,
+        active: false,
+        position: 1,
+        model: "anthropic/claude-3.5-sonnet"
+      )
 
       insert(:llm_config, active: false, position: 2)
 
       result = OpenRouter.resolve_config()
 
-      assert length(result) == 2
-      assert Enum.map(result, & &1.id) == [c1.id, c2.id]
+      assert Enum.map(result, & &1.id) == [c1.id]
     end
 
     test "caches active configs on second call" do
@@ -125,7 +123,7 @@ defmodule Bodhi.OpenRouterTest do
       assert decoded["max_tokens"] == 4096
     end
 
-    test "uses models array with fallback for multiple" do
+    test "uses one model when passed a legacy list" do
       configs = [
         build(:llm_config,
           model: "openai/gpt-4o",
@@ -141,14 +139,9 @@ defmodule Bodhi.OpenRouterTest do
       body = OpenRouter.build_body(@messages, @prompt, configs)
       decoded = Jason.decode!(body)
 
-      refute Map.has_key?(decoded, "model")
-
-      assert decoded["models"] == [
-               "openai/gpt-4o",
-               "anthropic/claude-3.5-sonnet"
-             ]
-
-      assert decoded["route"] == "fallback"
+      assert decoded["model"] == "openai/gpt-4o"
+      refute Map.has_key?(decoded, "models")
+      refute Map.has_key?(decoded, "route")
       assert decoded["temperature"] == 0.5
     end
 
diff --git a/test/bodhi/tg_webhook_handler_test.exs b/test/bodhi/tg_webhook_handler_test.exs
index 841de83..2d2be8d 100644
--- a/test/bodhi/tg_webhook_handler_test.exs
+++ b/test/bodhi/tg_webhook_handler_test.exs
@@ -1,8 +1,8 @@
 defmodule Bodhi.TgWebhookHandlerTest do
   use Bodhi.ObanCase
 
-  alias Telegex.Type.{Chat, Message, MessageEntity, Update, User}
   alias Bodhi.TgWebhookHandler
+  alias Telegex.Type.{Chat, Message, MessageEntity, Update, User}
 
   describe "handle_update/1" do
     test "Any TG update are handled correctly" do
diff --git a/test/bodhi_web/live/llm_config_live_test.exs b/test/bodhi_web/live/llm_config_live_test.exs
index bc69325..494aa5d 100644
--- a/test/bodhi_web/live/llm_config_live_test.exs
+++ b/test/bodhi_web/live/llm_config_live_test.exs
@@ -67,21 +67,36 @@ defmodule BodhiWeb.LlmConfigLiveTest do
              )
     end
 
-    test "toggles active status", %{
+    test "shows and clears the current model selection", %{
       conn: conn,
       llm_config: config
     } do
       {:ok, live, _html} = live(conn, ~p"/llm-configs")
 
-      assert live
-             |> element(
-               "#llm_configs-#{config.id} a",
-               "Deactivate"
-             )
-             |> render_click()
+      assert has_element?(live, "#current-model", config.model)
+
+      live
+      |> element("#clear-model-selection")
+      |> render_click()
+
+      assert has_element?(live, "#current-model", "openrouter/free")
+      refute has_element?(live, "#clear-model-selection")
+    end
+
+    test "selects another model and refreshes the selected state", %{
+      conn: conn,
+      llm_config: current
+    } do
+      candidate = insert(:llm_config, active: false)
+      {:ok, live, _html} = live(conn, ~p"/llm-configs")
 
-      html = render(live)
-      assert html =~ "Activate"
+      live
+      |> element("#select-model-#{candidate.id}")
+      |> render_click()
+
+      assert has_element?(live, "#current-model", candidate.model)
+      assert has_element?(live, "#llm_configs-#{candidate.id}", "Selected")
+      refute has_element?(live, "#llm_configs-#{current.id}", "Selected")
     end
   end
 
@@ -118,13 +133,12 @@ defmodule BodhiWeb.LlmConfigLiveTest do
       assert html =~ active.name
       assert html =~ inactive.name
 
-      html =
-        live
-        |> form("#filter-form", %{search: "gpt"})
-        |> render_change()
+      live
+      |> form("#filter-form", %{search: "gpt"})
+      |> render_change()
 
-      assert html =~ active.name
-      refute html =~ inactive.name
+      assert has_element?(live, "#llm_configs-#{active.id}")
+      refute has_element?(live, "#llm_configs-#{inactive.id}")
     end
 
     test "active dropdown filters rows", %{
@@ -134,21 +148,19 @@ defmodule BodhiWeb.LlmConfigLiveTest do
     } do
       {:ok, live, _html} = live(conn, ~p"/llm-configs")
 
-      html =
-        live
-        |> form("#filter-form", %{active: "active"})
-        |> render_change()
+      live
+      |> form("#filter-form", %{active: "active"})
+      |> render_change()
 
-      assert html =~ active.name
-      refute html =~ inactive.name
+      assert has_element?(live, "#llm_configs-#{active.id}")
+      refute has_element?(live, "#llm_configs-#{inactive.id}")
 
-      html =
-        live
-        |> form("#filter-form", %{active: "inactive"})
-        |> render_change()
+      live
+      |> form("#filter-form", %{active: "inactive"})
+      |> render_change()
 
-      refute html =~ active.name
-      assert html =~ inactive.name
+      refute has_element?(live, "#llm_configs-#{active.id}")
+      assert has_element?(live, "#llm_configs-#{inactive.id}")
     end
 
     test "clicking column header sorts by that column",
@@ -161,8 +173,8 @@ defmodule BodhiWeb.LlmConfigLiveTest do
         |> render_click()
 
       # Alpha before Beta in asc
-      alpha_pos = :binary.match(html, active.name)
-      beta_pos = :binary.match(html, inactive.name)
+      alpha_pos = :binary.match(html, "id=\"llm_configs-#{active.id}\"")
+      beta_pos = :binary.match(html, "id=\"llm_configs-#{inactive.id}\"")
       assert elem(alpha_pos, 0) < elem(beta_pos, 0)
     end
 
@@ -182,8 +194,8 @@ defmodule BodhiWeb.LlmConfigLiveTest do
         |> render_click()
 
       # Beta before Alpha in desc
-      alpha_pos = :binary.match(html, active.name)
-      beta_pos = :binary.match(html, inactive.name)
+      alpha_pos = :binary.match(html, "id=\"llm_configs-#{active.id}\"")
+      beta_pos = :binary.match(html, "id=\"llm_configs-#{inactive.id}\"")
       assert elem(beta_pos, 0) < elem(alpha_pos, 0)
     end
 
@@ -216,6 +228,8 @@ defmodule BodhiWeb.LlmConfigLiveTest do
     test "creates new config with valid data", %{conn: conn} do
       {:ok, live, _html} = live(conn, ~p"/llm-configs/new")
 
+      refute has_element?(live, "#llm-config-form input[name='llm_config[active]']")
+
       assert live
              |> form("#llm-config-form", llm_config: @invalid_attrs)
              |> render_change() =~ "can&#39;t be blank"
@@ -223,8 +237,7 @@ defmodule BodhiWeb.LlmConfigLiveTest do
       create_attrs = %{
         name: "test-config",
         model: "openai/gpt-4o",
-        position: 0,
-        active: true
+        position: 0
       }
 
       assert {:ok, index_live, _html} =
diff --git a/test/support/factory.ex b/test/support/factory.ex
index d28c538..c91d70c 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -7,8 +7,8 @@ defmodule Bodhi.Factory do
 
   alias Bodhi.Chats.{Chat, LlmResponse, Message, Summary}
   alias Bodhi.LlmConfigs.LlmConfig
-  alias Bodhi.Users.User
   alias Bodhi.Prompts.Prompt
+  alias Bodhi.Users.User
 
   def chat_factory do
     id = Faker.random_between(1_000_000, 1_000_000_000)