diff --git a/storage/metric/memory.go b/storage/metric/memory.go
index 7878a15ed1..913de569f6 100644
--- a/storage/metric/memory.go
+++ b/storage/metric/memory.go
@@ -266,12 +266,9 @@ func (s *memorySeriesStorage) Flush(flushOlderThan time.Time, queue chan<- clien
 
 	s.Lock()
 	for _, fingerprint := range emptySeries {
-		series, _ := s.fingerprintToSeries[*fingerprint]
-		if series.empty() {
-			continue
+		if s.fingerprintToSeries[*fingerprint].empty() {
+			s.dropSeries(fingerprint)
 		}
-
-		s.dropSeries(fingerprint)
 	}
 	s.Unlock()
 }