diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6bfc28..496a836 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## Dev
 
+### Enhancements
+
+- Optimize `Aja.Vector.flat_map/2` and `Aja.Enum.flat_map/2` when used for
+  filtering
+- Bump `ex_doc` to the latest version
+
 ## v0.6.5 (2024-04-26)
 
 ### Enhancements
diff --git a/bench/enum/flat_map.exs b/bench/enum/flat_map.exs
index e277942..714f250 100644
--- a/bench/enum/flat_map.exs
+++ b/bench/enum/flat_map.exs
@@ -1,7 +1,7 @@
-list = Enum.to_list(1..100)
+list = Enum.to_list(-50..50)
 vector = Aja.Vector.new(list)
 
-fun = fn x -> [x, x] end
+fun = fn x -> if x > 0, do: [x], else: [] end
 
 Benchee.run(%{
   "Aja.Vector.flat_map/2 (vector)" => fn -> Aja.Vector.flat_map(vector, fun) end,
diff --git a/bench/enum/flat_map.results.txt b/bench/enum/flat_map.results.txt
index d2e54a2..bb964a3 100644
--- a/bench/enum/flat_map.results.txt
+++ b/bench/enum/flat_map.results.txt
@@ -1,31 +1,35 @@
-Operating System: Linux
-CPU Information: Intel(R) Core(TM) i7-8550U CPU @ 1.80GHz
+Operating System: macOS
+CPU Information: Apple M1
 Number of Available Cores: 8
-Available memory: 15.41 GB
-Elixir 1.12.0
-Erlang 24.0
+Available memory: 16 GB
+Elixir 1.17.2
+Erlang 27.0
+JIT enabled: true
 
 Benchmark suite executing with the following configuration:
 warmup: 2 s
 time: 5 s
 memory time: 0 ns
+reduction time: 0 ns
 parallel: 1
 inputs: none specified
 Estimated total run time: 28 s
 
-Benchmarking Aja.Enum.flat_map/2 (list)...
-Benchmarking Aja.Enum.flat_map/2 (vector)...
-Benchmarking Aja.Vector.flat_map/2 (vector)...
-Benchmarking Enum.flat_map/2 (list)...
+Benchmarking Aja.Enum.flat_map/2 (list) ...
+Benchmarking Aja.Enum.flat_map/2 (vector) ...
+Benchmarking Aja.Vector.flat_map/2 (vector) ...
+Benchmarking Enum.flat_map/2 (list) ...
+Calculating statistics...
+Formatting results...
 
 Name                                     ips        average  deviation         median         99th %
-Aja.Enum.flat_map/2 (list)          396.08 K        2.52 μs   ±673.97%        2.22 μs        3.37 μs
-Enum.flat_map/2 (list)              377.16 K        2.65 μs   ±776.79%        2.33 μs        4.19 μs
-Aja.Enum.flat_map/2 (vector)        276.50 K        3.62 μs   ±463.19%        3.22 μs        5.82 μs
-Aja.Vector.flat_map/2 (vector)      234.64 K        4.26 μs   ±353.39%        3.89 μs        7.29 μs
+Aja.Enum.flat_map/2 (vector)          1.65 M      606.92 ns  ±4835.70%         541 ns         708 ns
+Aja.Enum.flat_map/2 (list)            1.37 M      727.73 ns  ±3873.32%         625 ns         792 ns
+Aja.Vector.flat_map/2 (vector)        1.33 M      749.51 ns  ±2874.31%         667 ns         875 ns
+Enum.flat_map/2 (list)                0.63 M     1586.46 ns   ±870.49%        1541 ns        1709 ns
 
-Comparison:
-Aja.Enum.flat_map/2 (list)          396.08 K
-Enum.flat_map/2 (list)              377.16 K - 1.05x slower +0.127 μs
-Aja.Enum.flat_map/2 (vector)        276.50 K - 1.43x slower +1.09 μs
-Aja.Vector.flat_map/2 (vector)      234.64 K - 1.69x slower +1.74 μs
+Comparison: 
+Aja.Enum.flat_map/2 (vector)          1.65 M
+Aja.Enum.flat_map/2 (list)            1.37 M - 1.20x slower +120.81 ns
+Aja.Vector.flat_map/2 (vector)        1.33 M - 1.23x slower +142.60 ns
+Enum.flat_map/2 (list)                0.63 M - 2.61x slower +979.54 ns
diff --git a/lib/helpers/enum_helper.ex b/lib/helpers/enum_helper.ex
index 12a7ef7..4edb5c8 100644
--- a/lib/helpers/enum_helper.ex
+++ b/lib/helpers/enum_helper.ex
@@ -80,7 +80,13 @@ defmodule Aja.EnumHelper do
     case try_get_raw_vec_or_list(enumerable) do
       nil ->
         enumerable
-        |> Enum.reduce([], fn value, acc -> [to_list(fun.(value)) | acc] end)
+        |> Enum.reduce([], fn value, acc ->
+          case fun.(value) do
+            [] -> acc
+            list when is_list(list) -> [list | acc]
+            other -> [to_list(other) | acc]
+          end
+        end)
         |> unwrap_flat_map([])
 
       list when is_list(list) ->
@@ -88,7 +94,13 @@ defmodule Aja.EnumHelper do
 
       vector ->
         vector
-        |> RawVector.map_reverse_list(fn value -> to_list(fun.(value)) end)
+        |> RawVector.foldl([], fn value, acc ->
+          case fun.(value) do
+            [] -> acc
+            list when is_list(list) -> [list | acc]
+            other -> [to_list(other) | acc]
+          end
+        end)
         |> unwrap_flat_map([])
     end
   end
@@ -97,6 +109,9 @@ defmodule Aja.EnumHelper do
 
   defp flat_map_list([head | tail], fun) do
     case fun.(head) do
+      # The two first clauses are optimizations
+      [] -> flat_map_list(tail, fun)
+      [elem] -> [elem | flat_map_list(tail, fun)]
       list when is_list(list) -> list ++ flat_map_list(tail, fun)
       other -> to_list(other) ++ flat_map_list(tail, fun)
     end
@@ -104,6 +119,11 @@ defmodule Aja.EnumHelper do
 
   defp unwrap_flat_map([], acc), do: acc
 
+  # This clause is an optimization
+  defp unwrap_flat_map([[elem] | tail], acc) do
+    unwrap_flat_map(tail, [elem | acc])
+  end
+
   defp unwrap_flat_map([head | tail], acc) do
     unwrap_flat_map(tail, head ++ acc)
   end