1 files changed, 8 insertions, 2 deletions
diff --git a/server/store/sqldb.go b/server/store/sqldb.go
index 2efca0e..bdb8893 100644
--- a/server/store/sqldb.go
+++ b/server/store/sqldb.go
@@ -120,8 +120,14 @@ func (db *SQLStore) List(includeExpired bool) ([]*CertRecord, error) {
 		return nil, err
 	}
 	recs := []*CertRecord{}
-	if err := db.listAll.Select(&recs); err != nil {
-		return nil, err
+	if includeExpired {
+		if err := db.listAll.Select(&recs); err != nil {
+			return nil, err
+		}
+	} else {
+		if err := db.listCurrent.Select(&recs, time.Now()); err != nil {
+			return nil, err
+		}
 	}
 	return recs, nil
 }