diff --git a/lib/pleroma/upload/filter.ex b/lib/pleroma/upload/filter.ex
index 661135634..367acd214 100644
--- a/lib/pleroma/upload/filter.ex
+++ b/lib/pleroma/upload/filter.ex
@@ -43,4 +43,6 @@ def filter([filter | rest], upload) do
         error
     end
   end
+
+  def filter(nil, upload), do: filter([], upload)
 end
diff --git a/test/support/data_case.ex b/test/support/data_case.ex
index 0b41f0f63..23c858d2a 100644
--- a/test/support/data_case.ex
+++ b/test/support/data_case.ex
@@ -107,7 +107,7 @@ def stub_pipeline do
   def ensure_local_uploader(context) do
     test_uploader = Map.get(context, :uploader, Pleroma.Uploaders.Local)
     uploader = Pleroma.Config.get([Pleroma.Upload, :uploader])
-    filters = Pleroma.Config.get([Pleroma.Upload, :filters])
+    filters = Pleroma.Config.get([Pleroma.Upload, :filters]) || []
 
     Pleroma.Config.put([Pleroma.Upload, :uploader], test_uploader)
     Pleroma.Config.put([Pleroma.Upload, :filters], [])