diff --git a/DataFormats/TrackerRecHit2D/interface/SiPixelRecHitQuality.h b/DataFormats/TrackerRecHit2D/interface/SiPixelRecHitQuality.h
index ff56be02a0ef6..29e7169ec7105 100644
--- a/DataFormats/TrackerRecHit2D/interface/SiPixelRecHitQuality.h
+++ b/DataFormats/TrackerRecHit2D/interface/SiPixelRecHitQuality.h
@@ -123,6 +123,9 @@ class SiPixelRecHitQuality {
     inline void setProbabilityQ(float prob, QualWordType& qualWord) const {
       if (prob > 1.0f && prob <= 1.0f + std::numeric_limits<float>::epsilon()) {
         prob = 1;
+      } else if (prob == -1.0f) {
+        // default prob in absence of Q probability computation is -1 --> set to 0
+        prob = 0;
       } else if (prob < 0.0f || prob > 1.0f + std::numeric_limits<float>::epsilon()) {
         warningOutOfBoundProb("Q", prob, qualWord);
         prob = 0;
diff --git a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEClusterRepair_cfi.py b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEClusterRepair_cfi.py
index f3f0697ca8a77..7823d45144ae2 100644
--- a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEClusterRepair_cfi.py
+++ b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEClusterRepair_cfi.py
@@ -2,4 +2,7 @@
 
 from RecoLocalTracker.SiPixelRecHits._templates2_default_cfi import _templates2_default
 templates2 = _templates2_default.clone()
-
+templates2_speed0 = _templates2_default.clone(
+    ComponentName = "PixelCPEClusterRepairWithoutProbQ",
+    speed = 0
+)
diff --git a/RecoTracker/TrackProducer/python/TrackProducerIterativeDefault_cfi.py b/RecoTracker/TrackProducer/python/TrackProducerIterativeDefault_cfi.py
index 0abf60cacedee..b12520ca5a5d0 100644
--- a/RecoTracker/TrackProducer/python/TrackProducerIterativeDefault_cfi.py
+++ b/RecoTracker/TrackProducer/python/TrackProducerIterativeDefault_cfi.py
@@ -5,4 +5,5 @@
     useSimpleMF = cms.bool(True),
     SimpleMagneticField = cms.string("ParabolicMf"),
     Propagator = cms.string('PropagatorWithMaterialParabolicMf'),
+    TTRHBuilder = cms.string('WithAngleAndTemplateWithoutProbQ')
 )
diff --git a/RecoTracker/TransientTrackingRecHit/python/TTRHBuilderWithTemplate_cfi.py b/RecoTracker/TransientTrackingRecHit/python/TTRHBuilderWithTemplate_cfi.py
index 535dd7bd5e23c..f1d0f5e3eb7ed 100644
--- a/RecoTracker/TransientTrackingRecHit/python/TTRHBuilderWithTemplate_cfi.py
+++ b/RecoTracker/TransientTrackingRecHit/python/TTRHBuilderWithTemplate_cfi.py
@@ -17,7 +17,10 @@
 from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
 phase1Pixel.toModify(TTRHBuilderAngleAndTemplate, PixelCPE = 'PixelCPEClusterRepair')
 
+TTRHBuilderAngleAndTemplateWithoutProbQ = TTRHBuilderAngleAndTemplate.clone(ComponentName = 'WithAngleAndTemplateWithoutProbQ')
+phase1Pixel.toModify(TTRHBuilderAngleAndTemplateWithoutProbQ, PixelCPE = 'PixelCPEClusterRepairWithoutProbQ')
+
 # Turn off template reco for phase 2 (when not supported)
 from Configuration.ProcessModifiers.PixelCPEGeneric_cff import PixelCPEGeneric
 PixelCPEGeneric.toModify(TTRHBuilderAngleAndTemplate, PixelCPE = 'PixelCPEGeneric')
-
+PixelCPEGeneric.toModify(TTRHBuilderAngleAndTemplateWithoutProbQ, PixelCPE = 'PixelCPEGeneric')