diff --git a/src/benchmarking.jl b/src/benchmarking.jl
index beae7d94..61a7916f 100644
--- a/src/benchmarking.jl
+++ b/src/benchmarking.jl
@@ -39,9 +39,11 @@ function benchmark(init, setup, f, teardown; evals::Union{Int, Nothing}=nothing,
         sample, t
     end
 
+    samples == 0 && return Benchmark([bench(evals, false)[1]])
+
     warmup, start_time = bench(1, false)
 
-    (samples == 0 || seconds == 0) && return Benchmark([warmup])
+    seconds == 0 && return Benchmark([warmup])
 
     new_evals = if evals === nothing
         @assert evals === samples === nothing && seconds !== nothing
diff --git a/test/runtests.jl b/test/runtests.jl
index 2506ed1d..b7856508 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -50,7 +50,7 @@ using Chairmarks: Sample, Benchmark
         @testset "low sample count (#91)" begin
             b = @be sleep(.001) evals=4 samples=0
             @test Chairmarks.only(b.samples).warmup == 0 # Qualify only for compat
-            @test_broken Chairmarks.only(b.samples).evals == 4
+            @test Chairmarks.only(b.samples).evals == 4
 
             b = @be sleep(.001) evals=4 samples=1
             @test Chairmarks.only(b.samples).warmup == 1