diff --git a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
index 4cf95a581..f20105bee 100644
--- a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
@@ -144,8 +144,15 @@ def update_credentials(%{assigns: %{user: user}} = conn, params) do
       |> Enum.dedup()
 
     params =
-      if Map.has_key?(params, "fields_attributes") && Enum.all?(params["fields_attributes"], &is_tuple/1) do
-        Map.update!(params, "fields_attributes", &Enum.map(&1, fn {_, v} -> v end))
+      if Map.has_key?(params, "fields_attributes") do
+        Map.update!(params, "fields_attributes", fn fields ->
+          if Enum.all?(fields, &is_tuple/1) do
+            Enum.map(fields, fn {_, v} -> v end)
+          else
+            fields
+          end
+          |> Enum.filter(fn %{"name" => n} -> n != "" end)
+        end)
       else
         params
       end