diff --git a/src/dvb/dvb_adapter.c b/src/dvb/dvb_adapter.c
index ad25b85..ef6f4a0 100644
--- a/src/dvb/dvb_adapter.c
+++ b/src/dvb/dvb_adapter.c
@@ -719,8 +719,17 @@ dvb_adapter_clean(th_dvb_adapter_t *tda)
     service_remove_subscriber(t, NULL, SM_CODE_SUBSCRIPTION_OVERRIDDEN);
 }

-
-
+/**
+ *
+ */
+static void
+dvb_adapter_rx_ts_pkt(th_dvb_adapter_t *tda, const uint8_t *tsb)
+{
+  service_t *t;
+  LIST_FOREACH(t, &tda->tda_transports, s_active_link)
+    if(t->s_dvb_mux_instance == tda->tda_mux_current)
+      ts_recv_packet1(t, tsb, NULL);
+}

 /**
  *
@@ -731,7 +740,6 @@ dvb_adapter_input_dvr(void *aux)
   th_dvb_adapter_t *tda = aux;
   int fd, i, r, c, efd, nfds;
   uint8_t tsb[188 * 10];
-  service_t *t;
   struct epoll_event ev;

   fd = tvh_open(tda->tda_dvr_path, O_RDONLY | O_NONBLOCK, 0);
@@ -781,17 +789,12 @@ dvb_adapter_input_dvr(void *aux)
       }
     }

-    /* find mux */
-    LIST_FOREACH(t, &tda->tda_transports, s_active_link)
-      if(t->s_dvb_mux_instance == tda->tda_mux_current)
-        break;
-
     /* Process */
     while (r >= 188) {

       /* sync */
       if (tsb[i] == 0x47) {
-        if(t) ts_recv_packet1(t, tsb + i, NULL);
+        dvb_adapter_rx_ts_pkt(tda, tsb + i);
         i += 188;
         r -= 188;