Index: libs/libmythtv/channelutil.cpp
===================================================================
--- libs/libmythtv/channelutil.cpp	(revision 7205)
+++ libs/libmythtv/channelutil.cpp	(working copy)
@@ -718,7 +718,9 @@
     query.bindValue(":SERVICEID", service_id);
     query.bindValue(":ATSCSRCID", atsc_src_id);
     query.bindValue(":USEOAG",    use_on_air_guide);
-    query.bindValue(":VISIBLE",   !(hidden || hidden_in_guide));
+    query.bindValue(":VISIBLE",   !hidden);
+    (void) hidden_in_guide; // we can't currently hide just the channel guide
+
     if (freqid > 0)
         query.bindValue(":FREQID",    freqid);
     query.bindValue(":TVFORMAT", (atsc_major_channel > 0) ? "atsc" : "dvb");
Index: libs/libmythtv/siscan.cpp
===================================================================
--- libs/libmythtv/siscan.cpp	(revision 7206)
+++ libs/libmythtv/siscan.cpp	(working copy)
@@ -1150,7 +1150,7 @@
                     chan_num,
                     vct->ProgramNumber(i),
                     vct->MajorChannel(i), vct->MinorChannel(i),
-                    true,
+                    !vct->IsHiddenInGuide(i) /* use on air guide */,
                     vct->IsHidden(i), vct->IsHiddenInGuide(i),
                     freqid);
             }