Index: libs/libmythtv/hdhrstreamhandler.cpp
===================================================================
--- libs/libmythtv/hdhrstreamhandler.cpp	(revision 22889)
+++ libs/libmythtv/hdhrstreamhandler.cpp	(working copy)
@@ -692,13 +692,16 @@
         return QString::null;
     }
 
-    if (error && name == QString("channel"))
-    {
-        QString newval = val;
-        newval.replace("qam_256", "qam");
-        newval.replace("qam_64", "qam");
-        return TunerSet(name, newval, report_error_return, print_error);
-    }
+    if (error && name == QString("channel")) 
+    { 
+        if (val.contains("qam_256") || val.contains("qam_64"))
+        {
+            QString newval = val;
+            newval.replace("qam_256", "qam"); 
+            newval.replace("qam_64", "qam"); 
+            return TunerSet(name, newval, report_error_return, print_error); 
+        }
+    } 
 
     if (report_error_return && error)
     {