diff --git a/device.c b/device.c
index 84cda5c..02e60fd 100644
--- a/device.c
+++ b/device.c
@@ -116,8 +116,10 @@ cString cSatipDevice::GetSatipStatus(void)
             info = cString::sprintf("%sCardIndex: %d  HasLock: yes  Strength: %d  Quality: %d%s\n", *info, device->CardIndex(), device->SignalStrength(), device->SignalQuality(), live ? "  Live: yes" : "");
          else
             info = cString::sprintf("%sCardIndex: %d  HasLock: no\n", *info, device->CardIndex());
-         if (channel && channel->Number() > 0)
-            info = cString::sprintf("%sTransponder: %d  Channel: %s\n", *info, (channel && channel->Number() > 0) ? channel->Transponder() : 0, (channel && channel->Number() > 0) ? channel->Name() : "---");
+         if (channel && channel->Number() > 0 && device->Receiving())
+            info = cString::sprintf("%sTransponder: %d  Channel: %s\n", *info, channel->Transponder(), channel->Name());
+         else
+            info = cString::sprintf("%sTransponder: %d\n", *info, channel->Transponder());
          if (timers)
             info = cString::sprintf("%sRecording: %d timer%s\n", *info, timers, (timers > 1) ? "s" : "");
          info = cString::sprintf("%s\n", *info);