diff --git a/storage/local/interface.go b/storage/local/interface.go
index 733da1a76d..e2253667db 100644
--- a/storage/local/interface.go
+++ b/storage/local/interface.go
@@ -14,9 +14,9 @@
 package local
 
 import (
+	"time"
 	clientmodel "github.com/prometheus/client_golang/model"
 	"github.com/prometheus/client_golang/prometheus"
-	"time"
 
 	"github.com/prometheus/prometheus/storage/metric"
 )
diff --git a/storage/local/persistence.go b/storage/local/persistence.go
index 73d3f00f3c..f4557d89b8 100644
--- a/storage/local/persistence.go
+++ b/storage/local/persistence.go
@@ -85,7 +85,7 @@ type indexingOp struct {
 // A Persistence is used by a Storage implementation to store samples
 // persistently across restarts. The methods are only goroutine-safe if
 // explicitly marked as such below. The chunk-related methods PersistChunk,
-// DropChunks, LoadChunks, and LoadChunkDescs can be called concurrently with
+// dropChunks, loadChunks, and loadChunkDescs can be called concurrently with
 // each other if each call refers to a different fingerprint.
 type persistence struct {
 	basePath string
@@ -350,26 +350,31 @@ func (p *persistence) recoverFromCrash(fingerprintToSeries map[clientmodel.Finge
 	return nil
 }
 
-// sanitizeSeries sanitizes a series based on its series file as defined by the provided directory and FileInfo.
-// The method returns the fingerprint as derived from the directory and file name, and whether the provided
-// file has been sanitized. A file that failed to be sanitized is deleted, if possible.
+// sanitizeSeries sanitizes a series based on its series file as defined by the
+// provided directory and FileInfo.  The method returns the fingerprint as
+// derived from the directory and file name, and whether the provided file has
+// been sanitized. A file that failed to be sanitized is deleted, if possible.
 //
 // The following steps are performed:
 //
-// - A file whose name doesn't comply with the naming scheme of a series file is simply deleted.
+// - A file whose name doesn't comply with the naming scheme of a series file is
+//   simply deleted.
 //
-// - If the size of the series file isn't a multiple of the chunk size, extraneous bytes are truncated.
-//   If the truncation fails, the file is deleted instead.
+// - If the size of the series file isn't a multiple of the chunk size,
+//   extraneous bytes are truncated.  If the truncation fails, the file is
+//   deleted instead.
 //
 // - A file that is empty (after truncation) is deleted.
 //
-// - A series that is not archived (i.e. it is in the fingerprintToSeries map) is checked for consistency of
-//   its various parameters (like head-chunk persistence state, offset of chunkDescs etc.). In particular,
-//   overlap between an in-memory head chunk with the most recent persisted chunk is checked. Inconsistencies
-//   are rectified.
+// - A series that is not archived (i.e. it is in the fingerprintToSeries map)
+//   is checked for consistency of its various parameters (like head-chunk
+//   persistence state, offset of chunkDescs etc.). In particular, overlap
+//   between an in-memory head chunk with the most recent persisted chunk is
+//   checked. Inconsistencies are rectified.
 //
-// - A series this in archived (i.e. it is not in the fingerprintToSeries map) is checked for its presence
-//   in the index of archived series. If it cannot be found there, it is deleted.
+// - A series this in archived (i.e. it is not in the fingerprintToSeries map)
+//   is checked for its presence in the index of archived series. If it cannot
+//   be found there, it is deleted.
 func (p *persistence) sanitizeSeries(dirname string, fi os.FileInfo, fingerprintToSeries map[clientmodel.Fingerprint]*memorySeries) (clientmodel.Fingerprint, bool) {
 	filename := path.Join(dirname, fi.Name())
 	purge := func() {
diff --git a/storage/local/series.go b/storage/local/series.go
index 154488d7af..d5850f05d5 100644
--- a/storage/local/series.go
+++ b/storage/local/series.go
@@ -397,7 +397,8 @@ func (s *memorySeries) newIterator(lockFunc, unlockFunc func()) SeriesIterator {
 }
 
 // head returns a pointer to the head chunk descriptor. The caller must have
-// locked the fingerprint of the memorySeries.
+// locked the fingerprint of the memorySeries. This method will panic if this
+// series has no chunk descriptors.
 func (s *memorySeries) head() *chunkDesc {
 	return s.chunkDescs[len(s.chunkDescs)-1]
 }
@@ -411,12 +412,6 @@ func (s *memorySeries) firstTime() clientmodel.Timestamp {
 	return s.savedFirstTime
 }
 
-// lastTime returns the timestamp of the last sample in the series. The caller
-// must have locked the fingerprint of the memorySeries.
-func (s *memorySeries) lastTime() clientmodel.Timestamp {
-	return s.head().lastTime()
-}
-
 // memorySeriesIterator implements SeriesIterator.
 type memorySeriesIterator struct {
 	lock, unlock func()
diff --git a/storage/local/storage.go b/storage/local/storage.go
index 0b51fa6e8e..7582ff11a9 100644
--- a/storage/local/storage.go
+++ b/storage/local/storage.go
@@ -16,6 +16,7 @@ package local
 
 import (
 	"container/list"
+	"math"
 	"sync/atomic"
 	"time"
 
@@ -704,13 +705,23 @@ func (s *memorySeriesStorage) maintainSeries(fp clientmodel.Fingerprint) {
 	if iOldestNotEvicted == -1 {
 		s.fpToSeries.del(fp)
 		s.numSeries.Dec()
+		// Make sure we have a head chunk descriptor (a freshly
+		// unarchived series has none).
+		if len(series.chunkDescs) == 0 {
+			cds, err := s.loadChunkDescs(fp, math.MaxInt64)
+			if err != nil {
+				glog.Errorf("Could not load chunk descriptors prior to archiving metric %v, metric will not be archived: %v", series.metric, err)
+				return
+			}
+			series.chunkDescs = cds
+		}
 		if err := s.persistence.archiveMetric(
-			fp, series.metric, series.firstTime(), series.lastTime(),
+			fp, series.metric, series.firstTime(), series.head().lastTime(),
 		); err != nil {
 			glog.Errorf("Error archiving metric %v: %v", series.metric, err)
-		} else {
-			s.seriesOps.WithLabelValues(archive).Inc()
+			return
 		}
+		s.seriesOps.WithLabelValues(archive).Inc()
 		return
 	}
 	// If we are here, the series is not archived, so check for chunkDesc
diff --git a/storage/local/storage_test.go b/storage/local/storage_test.go
index 182a1f5e0d..19c5fa80ee 100644
--- a/storage/local/storage_test.go
+++ b/storage/local/storage_test.go
@@ -382,7 +382,7 @@ func TestEvictAndPurgeSeries(t *testing.T) {
 	// Archive metrics.
 	ms.fpToSeries.del(fp)
 	if err := ms.persistence.archiveMetric(
-		fp, series.metric, series.firstTime(), series.lastTime(),
+		fp, series.metric, series.firstTime(), series.head().lastTime(),
 	); err != nil {
 		t.Fatal(err)
 	}