diff --git a/core/detectors/trd/CbmTrdParSetAsic.cxx b/core/detectors/trd/CbmTrdParSetAsic.cxx
index 51e8bf447639926f6ce2892e9fa8423efc79ec0f..cfd00344a441b2a6222f3a151a3cea1415c43fb3 100644
--- a/core/detectors/trd/CbmTrdParSetAsic.cxx
+++ b/core/detectors/trd/CbmTrdParSetAsic.cxx
@@ -189,15 +189,19 @@ void CbmTrdParSetAsic::putParams(FairParamList* l)
         Int_t nchannels(((CbmTrdParAsic*) iModuleIt.second)->GetNchannels());
         CbmTrdParFasp* fasp = (CbmTrdParFasp*) iModuleIt.second;
 
-        for (Int_t ich(0); ich < nchannels; ich += 2) {
-          for (Int_t ipair(0); ipair < 2; ipair++) {
+        for (Int_t ich(0); ich < nchannels; ich++) {
+//          for (Int_t ipair(0); ipair < 2; ipair++) {
             Int_t faspAddress                                  = fasp->GetChannelAddress(ich);
-            const CbmTrdParFaspChannel* ch                     = fasp->GetChannel(faspAddress, ipair);
-            asicInfo[offset + 1 + ich + ipair]                 = faspAddress;
-            asicInfo[offset + 1 + (1 * NFASPCH) + ich + ipair] = ch->GetPileUpTime();
-            asicInfo[offset + 1 + (2 * NFASPCH) + ich + ipair] = ch->GetThreshold();
-            asicInfo[offset + 1 + (3 * NFASPCH) + ich + ipair] = ch->GetMinDelaySignal();
-          }
+            asicInfo[offset + 1 + ich]                 = faspAddress;
+            const CbmTrdParFaspChannel* ch                     = fasp->GetChannel(ich);
+            if(!ch) {
+               LOG(info) << "Missing calib for Fasp[" << offset << "] pad " << faspAddress;
+               continue;
+            }
+            asicInfo[offset + 1 + (1 * NFASPCH) + ich] = ch->GetPileUpTime();
+            asicInfo[offset + 1 + (2 * NFASPCH) + ich] = ch->GetThreshold();
+            asicInfo[offset + 1 + (3 * NFASPCH) + ich] = ch->GetMinDelaySignal();
+//          }
         }
         iAsicNr++;
       }