diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 4c5f1e7a9..39e0f8492 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -541,7 +541,8 @@ def hashtag_timeline(%{assigns: %{user: user}} = conn, params) do
     local_only = params["local"] in [true, "True", "true", "1"]
 
     tags =
-      ([params["tag"]] ++ (params["any"] || []))
+      [params["tag"], params["any"]]
+      |> List.flatten()
       |> Enum.uniq()
       |> Enum.filter(& &1)
       |> Enum.map(&String.downcase(&1))