diff --git a/mythtv/mythtv/programs/mythbackend/autoexpire.cpp.orig b/mythtv/mythtv/programs/mythbackend/autoexpire.cpp
index 6f19eef..a6e1f12 100644
--- a/mythtv/mythtv/programs/mythbackend/autoexpire.cpp.orig
+++ b/mythtv/mythtv/programs/mythbackend/autoexpire.cpp
@@ -665,7 +665,7 @@ void AutoExpire::ExpireEpisodesOverMax(void)
 
     MSqlQuery query(MSqlQuery::InitCon());
     query.prepare("SELECT recordid, maxepisodes, title "
-                  "FROM record WHERE maxepisodes > 0 "
+                  "FROM record WHERE maxepisodes > 0 and autoexpire != 0"
                   "ORDER BY recordid ASC, maxepisodes DESC");
 
     if (query.exec() && query.isActive() && query.size() > 0)