diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp
index 970a849..1d41df2 100644
--- a/mythtv/libs/libmythtv/tv_rec.cpp
+++ b/mythtv/libs/libmythtv/tv_rec.cpp
@@ -1172,7 +1172,7 @@ void *TVRec::RecorderThread(void *param)
     return NULL;
 }
 
-bool get_use_eit(uint cardid)
+static bool get_use_eit(uint cardid)
 {
     MSqlQuery query(MSqlQuery::InitCon());
     query.prepare(
@@ -1212,6 +1212,25 @@ static bool is_dishnet_eit(int cardid)
     return false;
 }
 
+static bool get_dvb_on_demand(uint cardid)
+{
+    MSqlQuery query(MSqlQuery::InitCon());
+    query.prepare(
+        "SELECT dvb_on_demand "
+        "FROM capturecard "
+        "WHERE cardid     = :CARDID");
+    query.bindValue(":CARDID", cardid);
+
+    if (!query.exec() || !query.isActive())
+    {
+        MythContext::DBError("get_dvb_on_demand", query);
+        return false;
+    }
+    else if (query.next())
+        return query.value(0).toBool();
+    return false;
+}
+
 /** \fn TVRec::RunTV(void)
  *  \brief Event handling method, contains event loop.
  */
@@ -1374,6 +1393,12 @@ void TVRec::RunTV(void)
                         "for all sources on this card.");
                 eitScanStartTime = eitScanStartTime.addYears(1);
             }
+            else if (get_dvb_on_demand(GetCaptureCardNum()))
+            {
+                VERBOSE(VB_EIT, LOC + "EIT scanning disabled "
+                        "since the card should be used only on demand.");
+                eitScanStartTime = eitScanStartTime.addYears(1);
+            }
             else
             {
                 scanner->StartActiveScan(
diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
index a3527be..c65682e 100644
--- a/mythtv/libs/libmythtv/videosource.cpp
+++ b/mythtv/libs/libmythtv/videosource.cpp
@@ -803,7 +803,9 @@ class DVBOnDemand: public CheckBoxSetting, public CCSetting
         setHelpText(
             QObject::tr("This option makes the backend dvb-recorder "
                         "only open the card when it is actually in-use, leaving "
-                        "it free for other programs at other times."));
+                        "it free for other programs at other times "
+                        "(only recording and live-tv qualify as in-use, "
+                        "the EIT scan does not)."));
     };
 };