diff --git a/tsdb/querier.go b/tsdb/querier.go
index 05221127c..d9d6c62ee 100644
--- a/tsdb/querier.go
+++ b/tsdb/querier.go
@@ -1159,7 +1159,28 @@ func (it *deletedIterator) Seek(t int64) bool {
 	if it.it.Err() != nil {
 		return false
 	}
-	return it.it.Seek(t)
+	if ok := it.it.Seek(t); !ok {
+		return false
+	}
+
+	// Now double check if the entry falls into a deleted interval.
+	ts, _ := it.At()
+	for _, itv := range it.intervals {
+		if ts < itv.Mint {
+			return true
+		}
+
+		if ts > itv.Maxt {
+			it.intervals = it.intervals[1:]
+			continue
+		}
+
+		// We're in the middle of an interval, we can now call Next().
+		return it.Next()
+	}
+
+	// The timestamp is greater than all the deleted intervals.
+	return true
 }
 
 func (it *deletedIterator) Next() bool {
diff --git a/tsdb/querier_test.go b/tsdb/querier_test.go
index d03ec2cd0..d6f8d10aa 100644
--- a/tsdb/querier_test.go
+++ b/tsdb/querier_test.go
@@ -1260,103 +1260,6 @@ func TestDeletedIterator(t *testing.T) {
 		{r: tombstones.Intervals{{Mint: 1000, Maxt: 20000}}},
 	}
 
-	for _, c := range cases {
-		t.Run("Simple", func(t *testing.T) {
-			i := int64(-1)
-			it := &deletedIterator{it: chk.Iterator(nil), intervals: c.r[:]}
-			ranges := c.r[:]
-			for it.Next() {
-				i++
-				for _, tr := range ranges {
-					if tr.InBounds(i) {
-						i = tr.Maxt + 1
-						ranges = ranges[1:]
-					}
-				}
-
-				testutil.Assert(t, i < 1000, "")
-
-				ts, v := it.At()
-				testutil.Equals(t, act[i].t, ts)
-				testutil.Equals(t, act[i].v, v)
-			}
-			// There has been an extra call to Next().
-			i++
-			for _, tr := range ranges {
-				if tr.InBounds(i) {
-					i = tr.Maxt + 1
-					ranges = ranges[1:]
-				}
-			}
-
-			testutil.Assert(t, i >= 1000, "")
-			testutil.Ok(t, it.Err())
-		})
-		t.Run("Seek", func(t *testing.T) {
-			const seek = 10
-
-			i := int64(seek)
-			it := &deletedIterator{it: chk.Iterator(nil), intervals: c.r[:]}
-			ranges := c.r[:]
-
-			testutil.Assert(t, it.Seek(seek), "")
-			for it.Next() {
-				i++
-				for _, tr := range ranges {
-					if tr.InBounds(i) {
-						i = tr.Maxt + 1
-						ranges = ranges[1:]
-					}
-				}
-
-				testutil.Assert(t, i < 1000, "")
-
-				ts, v := it.At()
-				testutil.Equals(t, act[i].t, ts)
-				testutil.Equals(t, act[i].v, v)
-			}
-			// There has been an extra call to Next().
-			i++
-			for _, tr := range ranges {
-				if tr.InBounds(i) {
-					i = tr.Maxt + 1
-					ranges = ranges[1:]
-				}
-			}
-
-			testutil.Assert(t, i >= 1000, "")
-			testutil.Ok(t, it.Err())
-		})
-	}
-}
-
-func TestDeletedIterator_WithSeek(t *testing.T) {
-	chk := chunkenc.NewXORChunk()
-	app, err := chk.Appender()
-	testutil.Ok(t, err)
-	// Insert random stuff from (0, 1000).
-	act := make([]sample, 1000)
-	for i := 0; i < 1000; i++ {
-		act[i].t = int64(i)
-		act[i].v = rand.Float64()
-		app.Append(act[i].t, act[i].v)
-	}
-
-	cases := []struct {
-		r tombstones.Intervals
-	}{
-		{r: tombstones.Intervals{{Mint: 1, Maxt: 20}}},
-		{r: tombstones.Intervals{{Mint: 1, Maxt: 10}, {Mint: 12, Maxt: 20}, {Mint: 21, Maxt: 23}, {Mint: 25, Maxt: 30}}},
-		{r: tombstones.Intervals{{Mint: 1, Maxt: 10}, {Mint: 12, Maxt: 20}, {Mint: 20, Maxt: 30}}},
-		{r: tombstones.Intervals{{Mint: 1, Maxt: 10}, {Mint: 12, Maxt: 23}, {Mint: 25, Maxt: 30}}},
-		{r: tombstones.Intervals{{Mint: 1, Maxt: 23}, {Mint: 12, Maxt: 20}, {Mint: 25, Maxt: 30}}},
-		{r: tombstones.Intervals{{Mint: 1, Maxt: 23}, {Mint: 12, Maxt: 20}, {Mint: 25, Maxt: 3000}}},
-		{r: tombstones.Intervals{{Mint: 0, Maxt: 2000}}},
-		{r: tombstones.Intervals{{Mint: 500, Maxt: 2000}}},
-		{r: tombstones.Intervals{{Mint: 0, Maxt: 200}}},
-		{r: tombstones.Intervals{{Mint: 1000, Maxt: 20000}}},
-	}
-
 	for _, c := range cases {
 		i := int64(-1)
 		it := &deletedIterator{it: chk.Iterator(nil), intervals: c.r[:]}
@@ -1390,6 +1293,47 @@ func TestDeletedIterator_WithSeek(t *testing.T) {
 	}
 }
 
+func TestDeletedIterator_WithSeek(t *testing.T) {
+	chk := chunkenc.NewXORChunk()
+	app, err := chk.Appender()
+	testutil.Ok(t, err)
+	// Insert random stuff from (0, 1000).
+	act := make([]sample, 1000)
+	for i := 0; i < 1000; i++ {
+		act[i].t = int64(i)
+		act[i].v = float64(i)
+		app.Append(act[i].t, act[i].v)
+	}
+
+	cases := []struct {
+		r        tombstones.Intervals
+		seek     int64
+		ok       bool
+		seekedTs int64
+	}{
+		{r: tombstones.Intervals{{Mint: 1, Maxt: 20}}, seek: 1, ok: true, seekedTs: 21},
+		{r: tombstones.Intervals{{Mint: 1, Maxt: 20}}, seek: 20, ok: true, seekedTs: 21},
+		{r: tombstones.Intervals{{Mint: 1, Maxt: 20}}, seek: 10, ok: true, seekedTs: 21},
+		{r: tombstones.Intervals{{Mint: 1, Maxt: 20}}, seek: 999, ok: true, seekedTs: 999},
+		{r: tombstones.Intervals{{Mint: 1, Maxt: 20}}, seek: 1000, ok: false},
+		{r: tombstones.Intervals{{Mint: 1, Maxt: 23}, {Mint: 24, Maxt: 40}, {Mint: 45, Maxt: 3000}}, seek: 1, ok: true, seekedTs: 41},
+		{r: tombstones.Intervals{{Mint: 5, Maxt: 23}, {Mint: 24, Maxt: 40}, {Mint: 41, Maxt: 3000}}, seek: 5, ok: false},
+		{r: tombstones.Intervals{{Mint: 0, Maxt: 2000}}, seek: 10, ok: false},
+		{r: tombstones.Intervals{{Mint: 500, Maxt: 2000}}, seek: 10, ok: true, seekedTs: 10},
+		{r: tombstones.Intervals{{Mint: 500, Maxt: 2000}}, seek: 501, ok: false},
+	}
+
+	for _, c := range cases {
+		it := &deletedIterator{it: chk.Iterator(nil), intervals: c.r[:]}
+
+		testutil.Equals(t, c.ok, it.Seek(c.seek))
+		if c.ok {
+			ts, _ := it.At()
+			testutil.Equals(t, c.seekedTs, ts)
+		}
+	}
+}
+
 type series struct {
 	l      labels.Labels
 	chunks []chunks.Meta