diff --git a/DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.cc b/DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.cc
index 85b27594cfc07..237ddd40ca620 100644
--- a/DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.cc
+++ b/DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.cc
@@ -1239,7 +1239,8 @@ void Vx3DHLTAnalyzer::dqmEndLuminosityBlock(const LuminosityBlock& lumiBlock, co
       }
     }
     myGaussFit->SetRange(minXfit - (maxXfit - minXfit) / 2., maxXfit + (maxXfit - minXfit) / 2.);
-    Vx_X_Fit->getTH1()->Fit(myGaussFit, "QRL");
+    if (Vx_X_Fit->getTH1()->GetEntries() > 0)
+      Vx_X_Fit->getTH1()->Fit(myGaussFit, "QRL");
 
     myGaussFit->SetParameter(0, Vx_Y_Fit->getTH1()->GetMaximum());
     myGaussFit->SetParameter(1, Vx_Y_Fit->getTH1()->GetMean());
@@ -1259,7 +1260,8 @@ void Vx3DHLTAnalyzer::dqmEndLuminosityBlock(const LuminosityBlock& lumiBlock, co
       }
     }
     myGaussFit->SetRange(minXfit - (maxXfit - minXfit) / 2., maxXfit + (maxXfit - minXfit) / 2.);
-    Vx_Y_Fit->getTH1()->Fit(myGaussFit, "QRL");
+    if (Vx_Y_Fit->getTH1()->GetEntries() > 0)
+      Vx_Y_Fit->getTH1()->Fit(myGaussFit, "QRL");
 
     myGaussFit->SetParameter(0, Vx_Z_Fit->getTH1()->GetMaximum());
     myGaussFit->SetParameter(1, Vx_Z_Fit->getTH1()->GetMean());
@@ -1279,7 +1281,8 @@ void Vx3DHLTAnalyzer::dqmEndLuminosityBlock(const LuminosityBlock& lumiBlock, co
       }
     }
     myGaussFit->SetRange(minXfit - (maxXfit - minXfit) / 2., maxXfit + (maxXfit - minXfit) / 2.);
-    Vx_Z_Fit->getTH1()->Fit(myGaussFit, "QRL");
+    if (Vx_Z_Fit->getTH1()->GetEntries() > 0)
+      Vx_Z_Fit->getTH1()->Fit(myGaussFit, "QRL");
 
     delete myGaussFit;
   } else if ((nLumiFit != 0) && (lumiCounter % nLumiFit != 0) && (beginTimeOfFit != 0) && (runNumber != 0)) {
diff --git a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py
index 58a62ae56de98..6e3884dd01f05 100644
--- a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py
@@ -2,8 +2,8 @@
 import FWCore.ParameterSet.Config as cms
 
 import sys
-from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
-process = cms.Process("BeamPixel", Run2_2018)
+from Configuration.Eras.Era_Run3_cff import Run3
+process = cms.Process("BeamMonitor", Run3)
 
 unitTest = False
 if 'unitTest=True' in sys.argv:
@@ -213,7 +213,7 @@
 #----------------------------
 # File to save beamspot info
 #----------------------------
-if process.dqmRunConfig.type.value() is "production":
+if process.dqmRunConfig.type.value() == "production":
     process.pixelVertexDQM.fileName = "/nfshome0/dqmpro/BeamMonitorDQM/BeamPixelResults.txt"
 else:
     process.pixelVertexDQM.fileName = "/nfshome0/dqmdev/BeamMonitorDQM/BeamPixelResults.txt"