diff --git a/DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx b/DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx
index e7cb03e25be..3c589016874 100644
--- a/DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx
+++ b/DPG/Tasks/AOTTrack/PID/HMPID/hmpidTableProducer.cxx
@@ -11,26 +11,32 @@
 
 #include "tableHMPID.h"
 
+#include "Common/Core/PID/PIDTOF.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
 
-#include <CCDB/BasicCCDBManager.h>
+#include "CCDB/BasicCCDBManager.h"
+#include "CCDB/CcdbApi.h"
 #include <Framework/ASoA.h>
+#include <Framework/ASoAHelpers.h>
 #include <Framework/AnalysisDataModel.h>
-#include <Framework/AnalysisHelpers.h>
 #include <Framework/AnalysisTask.h>
-#include <Framework/Configurable.h>
 #include <Framework/HistogramRegistry.h>
-#include <Framework/HistogramSpec.h>
-#include <Framework/InitContext.h>
-#include <Framework/OutputObjHeader.h>
+#include <Framework/RunningWorkflowInfo.h>
 #include <Framework/runDataProcessing.h>
+#include <ReconstructionDataFormats/DCA.h>
+#include <ReconstructionDataFormats/PID.h>
+#include <ReconstructionDataFormats/Track.h>
+#include <ReconstructionDataFormats/TrackParametrization.h>
+
+#include <TTree.h>
 
-#include <cstdint>
 #include <string>
 #include <unordered_set>
 
@@ -135,6 +141,10 @@ struct HmpidTableProducer {
 
       float centrality = col.centFV0A();
 
+      // check cluster size sign
+      if (t.hmpidClusSize() <= 0)
+        continue;
+
       float hmpidPhotsCharge2[o2::aod::kDimPhotonsCharge];
 
       for (int i = 0; i < o2::aod::kDimPhotonsCharge; i++) {