diff --git a/benchmark/xsimd_benchmark.hpp b/benchmark/xsimd_benchmark.hpp
index 58fa2e680..6f6b91bf2 100644
--- a/benchmark/xsimd_benchmark.hpp
+++ b/benchmark/xsimd_benchmark.hpp
@@ -24,7 +24,7 @@ namespace xsimd
     using duration_type = std::chrono::duration<double, std::milli>;
 
     template <class T>
-    using bench_vector = std::vector<T, xsimd::aligned_allocator<T, default_arch::alignment()>>;
+    using bench_vector = std::vector<T, xsimd::aligned_allocator<T>>;
 
     template <class T>
     void init_benchmark(bench_vector<T>& lhs, bench_vector<T>& rhs, bench_vector<T>& res, size_t size)
diff --git a/examples/mandelbrot.cpp b/examples/mandelbrot.cpp
index 323ae2702..9a0d80e7a 100644
--- a/examples/mandelbrot.cpp
+++ b/examples/mandelbrot.cpp
@@ -290,7 +290,7 @@ int main()
     const float y1 = 1;
     const int maxIters = 256;
 
-    std::vector<int, xsimd::aligned_allocator<int, xsimd::default_arch::alignment()>> buf(width * height);
+    std::vector<int, xsimd::aligned_allocator<int>> buf(width * height);
 
     auto bencher = pico_bench::Benchmarker<milliseconds> { 64, seconds { 10 } };
 
diff --git a/include/xsimd/memory/xsimd_aligned_allocator.hpp b/include/xsimd/memory/xsimd_aligned_allocator.hpp
index 51779f31c..f6e9c9d12 100644
--- a/include/xsimd/memory/xsimd_aligned_allocator.hpp
+++ b/include/xsimd/memory/xsimd_aligned_allocator.hpp
@@ -39,7 +39,7 @@ namespace xsimd
      * @tparam T type of objects to allocate.
      * @tparam Align alignment in bytes.
      */
-    template <class T, size_t Align>
+    template <class T, size_t Align = std::conditional<std::is_same<unsupported, default_arch>::value, generic, default_arch>::type::alignment()>
     class aligned_allocator
     {
     public: