diff --git a/atc/db/build_factory.go b/atc/db/build_factory.go
index 6519ab63210..5e99553326c 100644
--- a/atc/db/build_factory.go
+++ b/atc/db/build_factory.go
@@ -178,7 +178,9 @@ func getBuildsWithDates(buildsQuery, minMaxIdQuery sq.SelectBuilder, page Page,
 
 		defer sinceRow.Close()
 
+		found := false
 		for sinceRow.Next() {
+			found = true
 			build := &build{conn: conn, lockFactory: lockFactory}
 			err = scanBuild(build, sinceRow, conn.EncryptionStrategy())
 			if err != nil {
@@ -193,6 +195,9 @@ func getBuildsWithDates(buildsQuery, minMaxIdQuery sq.SelectBuilder, page Page,
 			// of view of pagination.
 			newPage.Until = build.ID() - 1
 		}
+		if !found {
+			return []Build{}, Pagination{}, nil
+		}
 	}
 
 	if page.Until != 0 {
@@ -210,7 +215,10 @@ func getBuildsWithDates(buildsQuery, minMaxIdQuery sq.SelectBuilder, page Page,
 		}
 
 		defer untilRow.Close()
+
+		found := false
 		for untilRow.Next() {
+			found = true
 			build := &build{conn: conn, lockFactory: lockFactory}
 			err = scanBuild(build, untilRow, conn.EncryptionStrategy())
 			if err != nil {
@@ -225,6 +233,9 @@ func getBuildsWithDates(buildsQuery, minMaxIdQuery sq.SelectBuilder, page Page,
 			// of view of pagination.
 			newPage.Since = build.ID() + 1
 		}
+		if !found {
+			return []Build{}, Pagination{}, nil
+		}
 	}
 
 	err = tx.Commit()
diff --git a/atc/db/build_factory_test.go b/atc/db/build_factory_test.go
index 9d905cedc37..9870bbf1b36 100644
--- a/atc/db/build_factory_test.go
+++ b/atc/db/build_factory_test.go
@@ -1,6 +1,8 @@
 package db_test
 
 import (
+	"time"
+
 	"github.com/concourse/concourse/atc"
 	"github.com/concourse/concourse/atc/db"
 	. "github.com/onsi/ginkgo"
@@ -452,4 +454,67 @@ var _ = Describe("BuildFactory", func() {
 			Expect(builds).To(ConsistOf(build1DB, build2DB))
 		})
 	})
+
+	Describe("AllBuilds by date", func() {
+		var build1DB db.Build
+		var build2DB db.Build
+
+		BeforeEach(func() {
+			pipeline, _, err := team.SavePipeline("other-pipeline", atc.Config{
+				Jobs: atc.JobConfigs{
+					{
+						Name: "some-job",
+					},
+				},
+			}, db.ConfigVersion(0), false)
+			Expect(err).NotTo(HaveOccurred())
+
+			job, found, err := pipeline.Job("some-job")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(found).To(BeTrue())
+
+			build1DB, err = team.CreateOneOffBuild()
+			Expect(err).NotTo(HaveOccurred())
+
+			build2DB, err = job.CreateBuild()
+			Expect(err).NotTo(HaveOccurred())
+
+			_, err = team.CreateOneOffBuild()
+			Expect(err).NotTo(HaveOccurred())
+
+			started, err := build1DB.Start(atc.Plan{})
+			Expect(err).NotTo(HaveOccurred())
+			Expect(started).To(BeTrue())
+
+			started, err = build2DB.Start(atc.Plan{})
+			Expect(err).NotTo(HaveOccurred())
+			Expect(started).To(BeTrue())
+		})
+
+		Describe("with a future date as Page.Since", func() {
+			It("should return nothing", func() {
+				page := db.Page{
+					Limit:   10,
+					Since:   int(time.Now().Unix() + 10),
+					UseDate: true,
+				}
+				builds, _, err := buildFactory.AllBuilds(page)
+				Expect(err).NotTo(HaveOccurred())
+				Expect(len(builds)).To(Equal(0))
+			})
+		})
+
+		Describe("with a very old date as Page.Until", func() {
+			It("should return nothing", func() {
+				page := db.Page{
+					Limit:   10,
+					Until:   int(time.Now().Unix() - 10000),
+					UseDate: true,
+				}
+				builds, _, err := buildFactory.AllBuilds(page)
+				Expect(err).NotTo(HaveOccurred())
+				Expect(len(builds)).To(Equal(0))
+			})
+		})
+	})
 })