diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockGEM.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockGEM.cc
index a6f5cc4de77a8..1a31c86cf5b78 100644
--- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockGEM.cc
+++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockGEM.cc
@@ -278,10 +278,10 @@ namespace l1t {
           //                               << ", roll " << Hit_.Roll() << ", pad " << Hit_.Pad() << std::endl;
 
           (res->at(iOut)).push_GEM(GEM_);
-          if (!exact_duplicate)
+          if (!exact_duplicate and Hit_.Valid())
             res_hit->push_back(Hit_);
 
-          if (!exact_duplicate)
+          if (!exact_duplicate and Hit_.Valid())
             res_GEM->insertDigi(Hit_.GEM_DetId(), Hit_.CreateGEMPadDigiCluster());
 
           // Finished with unpacking one GEM Data Record
diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockRPC.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockRPC.cc
index 392becf28dd0a..c7625275c7b56 100644
--- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockRPC.cc
+++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockRPC.cc
@@ -275,9 +275,9 @@ namespace l1t {
                                         << ", phi " << Hit_.Phi_fp() / 4 << std::endl;
 
           (res->at(iOut)).push_RPC(RPC_);
-          if (!exact_duplicate)
+          if (!exact_duplicate and Hit_.Valid())
             res_hit->push_back(Hit_);
-          if (!exact_duplicate)
+          if (!exact_duplicate and Hit_.Valid())
             res_CPPF->push_back(Hit_.CreateCPPFDigi());
         }