diff --git a/services/storage/store.go b/services/storage/store.go
index e3c1c2b6b2c..9bc15adcf33 100644
--- a/services/storage/store.go
+++ b/services/storage/store.go
@@ -97,10 +97,10 @@ func (s *Store) validateArgs(database, rp string, start, end int64) (string, str
 		return "", "", 0, 0, errors.New("invalid retention policy")
 	}
 
-	if start <= 0 {
+	if start <= models.MinNanoTime {
 		start = models.MinNanoTime
 	}
-	if end <= 0 {
+	if end >= models.MaxNanoTime {
 		end = models.MaxNanoTime
 	}
 	return database, rp, start, end, nil