diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index bfdd01c70..f49af1ef8 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -252,40 +252,14 @@ defmodule Mix.Tasks.Pleroma.Config do
     if whitelisted_configs in [nil, false] do
       shell_error("No unwanted settings in ConfigDB. No changes made.")
     else
-      whitelisted_groups =
-        whitelisted_configs
-        |> Enum.filter(fn
-          {_group} -> true
-          _ -> false
-        end)
-        |> Enum.map(fn {group} -> group end)
-
-      whitelisted_keys =
-        whitelisted_configs
-        |> Enum.filter(fn
-          {_group, _key} -> true
-          _ -> false
-        end)
+      {whitelisted_groups, whitelisted_keys} = get_filters(whitelisted_configs)
 
       filtered =
         from(c in ConfigDB)
         |> Repo.all()
         |> Enum.filter(&not_whitelisted?(&1, whitelisted_groups, whitelisted_keys))
 
-      if not Enum.empty?(filtered) do
-        shell_info("The following settings will be removed from ConfigDB:\n")
-        Enum.each(filtered, &dump(&1))
-
-        if force or shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
-          filtered_ids = Enum.map(filtered, fn %{id: id} -> id end)
-
-          Repo.delete_all(from(c in ConfigDB, where: c.id in ^filtered_ids))
-        else
-          shell_error("No changes made.")
-        end
-      else
-        shell_error("No unwanted settings in ConfigDB. No changes made.")
-      end
+      do_config_filter(filtered, force)
     end
   end
 
@@ -307,39 +281,14 @@ defmodule Mix.Tasks.Pleroma.Config do
     if blacklisted_configs in [nil, false] do
       shell_error("No unwanted settings in ConfigDB. No changes made.")
     else
-      blacklisted_groups =
-        blacklisted_configs
-        |> Enum.filter(fn
-          {_group} -> true
-          _ -> false
-        end)
-
-      blacklisted_keys =
-        blacklisted_configs
-        |> Enum.filter(fn
-          {_group, _key} -> true
-          _ -> false
-        end)
+      {blacklisted_groups, blacklisted_keys} = get_filters(blacklisted_configs)
 
       filtered =
         from(c in ConfigDB)
         |> Repo.all()
         |> Enum.filter(&blacklisted?(&1, blacklisted_groups, blacklisted_keys))
 
-      if not Enum.empty?(filtered) do
-        shell_info("The following settings will be removed from ConfigDB:\n")
-        Enum.each(filtered, &dump(&1))
-
-        if force or shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
-          filtered_ids = Enum.map(filtered, fn %{id: id} -> id end)
-
-          Repo.delete_all(from(c in ConfigDB, where: c.id in ^filtered_ids))
-        else
-          shell_error("No changes made.")
-        end
-      else
-        shell_error("No unwanted settings in ConfigDB. No changes made.")
-      end
+      do_config_filter(filtered, force)
     end
   end
 
@@ -544,13 +493,49 @@ defmodule Mix.Tasks.Pleroma.Config do
     Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
   end
 
+  defp get_filters(config) do
+    groups =
+      config
+      |> Enum.filter(fn
+        {_group} -> true
+        _ -> false
+      end)
+      |>Enum.map(fn {group} -> group end)
+
+    keys =
+      config
+      |> Enum.filter(fn
+        {_group, _key} -> true
+        _ -> false
+      end)
+
+    {groups, keys}
+  end
+
   defp not_whitelisted?(%{group: group, key: key}, whitelisted_groups, whitelisted_keys) do
     not Enum.member?(whitelisted_groups, group) and
       not Enum.member?(whitelisted_keys, {group, key})
   end
 
   defp blacklisted?(%{group: group, key: key}, blacklisted_groups, blacklisted_keys) do
-    Enum.member?(blacklisted_groups, {group}) or
+    Enum.member?(blacklisted_groups, group) or
       Enum.member?(blacklisted_keys, {group, key})
   end
+
+  defp do_config_filter(filtered, _) when length(filtered) == 0 do
+    shell_error("No unwanted settings in ConfigDB. No changes made.")
+  end
+
+  defp do_config_filter(filtered, force) do
+    shell_info("The following settings will be removed from ConfigDB:\n")
+    Enum.each(filtered, &dump(&1))
+
+    if force or shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
+      filtered_ids = Enum.map(filtered, fn %{id: id} -> id end)
+
+      Repo.delete_all(from(c in ConfigDB, where: c.id in ^filtered_ids))
+    else
+      shell_error("No changes made.")
+    end
+  end
 end