diff --git a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
index da3f5a54..abda550d 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
@@ -486,7 +486,7 @@ linuxdvb_frontend_monitor ( void *aux )
   }
 
   /* Stop timer */
-  if (!mmi) return;
+  if (!mmi || !lfe->lfe_ready) return;
 
   /* re-arm */
   gtimer_arm(&lfe->lfe_monitor_timer, linuxdvb_frontend_monitor, lfe, 1);
@@ -506,12 +506,6 @@ linuxdvb_frontend_monitor ( void *aux )
   else
     status = SIGNAL_NONE;
 
-  if (!lfe->lfe_ready) {
-    /* send the status message to the higher layers _always_ */
-    status = SIGNAL_NONE;
-    goto status;
-  }
-
   /* Set default period */
   if (fe_status != lfe->lfe_status) {
     tvhdebug("linuxdvb", "%s - status %7s (%s%s%s%s%s%s)", buf,
@@ -767,7 +761,6 @@ linuxdvb_frontend_monitor ( void *aux )
     }
   }
 
-status:
   /* Send message */
   sigstat.status_text  = signal2str(status);
   sigstat.snr          = mmi->mmi_stats.snr;