diff --git a/lemur/certificates/service.py b/lemur/certificates/service.py
index 51fede4f..544c03d8 100644
--- a/lemur/certificates/service.py
+++ b/lemur/certificates/service.py
@@ -330,6 +330,12 @@ def render(args):
     query = database.session_query(Certificate)
 
     time_range = args.pop("time_range")
+    if not time_range:
+        six_month_old = arrow.now()\
+            .shift(months=current_app.config.get("HIDE_EXPIRED_CERTS_AFTER_MONTHS", -6))\
+            .format("YYYY-MM-DD")
+        query = query.filter(Certificate.not_after > six_month_old)
+
     destination_id = args.pop("destination_id")
     notification_id = args.pop("notification_id", None)
     show = args.pop("show")