diff --git a/apps/configurator/lib/configurator_web/live/game_modes/form.ex b/apps/configurator/lib/configurator_web/live/game_modes/form.ex
index 46487b7fe..1ff89d189 100644
--- a/apps/configurator/lib/configurator_web/live/game_modes/form.ex
+++ b/apps/configurator/lib/configurator_web/live/game_modes/form.ex
@@ -11,7 +11,7 @@ defmodule ConfiguratorWeb.GameModeConfigurationsLive.Form do
         %{"game_mode_configuration" => game_mode_configuration, "version" => version},
         socket
       ) do
-    maps = Configuration.list_map_configurations_by_version(version.id)
+    maps = Configuration.list_map_configurations_by_version(version.id) |> Enum.filter(& &1.active)
     changeset = Configuration.change_game_mode_configuration(game_mode_configuration)
 
     socket =
@@ -32,7 +32,7 @@ defmodule ConfiguratorWeb.GameModeConfigurationsLive.Form do
         socket
       ) do
     changeset = Configuration.change_game_mode_configuration(%GameModeConfiguration{})
-    maps = Configuration.list_map_configurations_by_version(version.id)
+    maps = Configuration.list_map_configurations_by_version(version.id) |> Enum.filter(& &1.active)
 
     socket =
       assign(socket,
diff --git a/apps/game_backend/lib/game_backend/configuration.ex b/apps/game_backend/lib/game_backend/configuration.ex
index 5f108e3bf..6d930a4af 100644
--- a/apps/game_backend/lib/game_backend/configuration.ex
+++ b/apps/game_backend/lib/game_backend/configuration.ex
@@ -247,9 +247,7 @@ defmodule GameBackend.Configuration do
 
   """
   def list_map_configurations_by_version(version_id) do
-    Repo.all(
-      from(m in MapConfiguration, where: m.version_id == ^version_id and m.active, order_by: [desc: m.inserted_at])
-    )
+    Repo.all(from(m in MapConfiguration, where: m.version_id == ^version_id, order_by: [desc: m.inserted_at]))
   end
 
   @doc """