diff --git a/lib/jsonapi/plugs/query_parser.ex b/lib/jsonapi/plugs/query_parser.ex
index b598112e..5e549f6b 100644
--- a/lib/jsonapi/plugs/query_parser.ex
+++ b/lib/jsonapi/plugs/query_parser.ex
@@ -113,7 +113,7 @@ defmodule JSONAPI.QueryParser do
 
     Enum.reduce(filter, config, fn {key, val}, acc ->
       check_filter_validity!(opts_filter, key, config)
-      %{acc | filter: Keyword.put(acc.filter, String.to_atom(key), val)}
+      %{acc | filter: Keyword.put(acc.filter, String.to_atom(key), parse_filter_value(val))}
     end)
   end
 
@@ -123,6 +123,21 @@ defmodule JSONAPI.QueryParser do
     end
   end
 
+  defp parse_filter_value(value) do
+    :jsonapi
+    |> Application.get_env(:filter_values_separator, nil)
+    |> do_parse_filter_value(value)
+  end
+
+  defp do_parse_filter_value(nil, value), do: value
+
+  defp do_parse_filter_value(separator, value) do
+    case String.split(value, separator) do
+      [value] -> value
+      values -> values
+    end
+  end
+
   @spec parse_fields(Config.t(), map()) :: Config.t() | no_return()
   def parse_fields(%Config{} = config, fields) when fields == %{}, do: config
 
diff --git a/test/jsonapi/plugs/query_parser_test.exs b/test/jsonapi/plugs/query_parser_test.exs
index 29c1ef58..c57f1b1e 100644
--- a/test/jsonapi/plugs/query_parser_test.exs
+++ b/test/jsonapi/plugs/query_parser_test.exs
@@ -36,11 +36,10 @@ defmodule JSONAPI.QueryParserTest do
   end
 
   setup do
+    previous_env = System.get_env()
     Application.put_env(:jsonapi, :field_transformation, :underscore)
 
-    on_exit(fn ->
-      Application.delete_env(:jsonapi, :field_transformation)
-    end)
+    on_exit(fn -> System.put_env(previous_env) end)
 
     {:ok, []}
   end
@@ -67,6 +66,20 @@ defmodule JSONAPI.QueryParserTest do
     assert filter[:name] == "jason"
   end
 
+  test "parse_filter/2 handles multiple comma-separated filter values if configured" do
+    Application.put_env(:jsonapi, :filter_values_separator, ";")
+    config = struct(Config, opts: [filter: ~w(name)], view: MyView)
+    filter = parse_filter(config, %{"name" => "jason;api"}).filter
+    assert filter[:name] == ["jason", "api"]
+  end
+
+  test "parse_filter/2 does not does not parse comma-separated filter values if not configured" do
+    Application.delete_env(:jsonapi, :filter_values_separator)
+    config = struct(Config, opts: [filter: ~w(name)], view: MyView)
+    filter = parse_filter(config, %{"name" => "jason;api"}).filter
+    assert filter[:name] == "jason;api"
+  end
+
   test "parse_filter/2 raises on invalid filters" do
     config = struct(Config, opts: [], view: MyView)