diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d9ea703e156ce7b7da49dc1d40b48e446cbb924f
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/CMakeLists.txt
@@ -0,0 +1,34 @@
+################################################################################
+# Package: MuonDQAMonitoring
+################################################################################
+
+# Declare the package name:
+atlas_subdir( MuonDQAMonitoring )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Control/AthenaMonitoring
+                          Control/StoreGate
+                          GaudiKernel
+                          PRIVATE
+                          DataQuality/DataQualityInterfaces
+                          Event/EventInfo
+                          TestPolicy
+                          Trigger/TrigT1/TrigT1Result )
+
+# External dependencies:
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
+find_package( dqm-common )
+find_package( tdaq-common )
+
+# Component(s) in the package:
+atlas_add_component( MuonDQAMonitoring
+                     src/*.cxx
+                     src/components/*.cxx
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${DQM-COMMON_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${DQM-COMMON_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaMonitoringLib StoreGateLib SGtests GaudiKernel DataQualityInterfaces EventInfo TrigT1Result )
+
+# Install files from the package:
+atlas_install_headers( MuonDQAMonitoring )
+atlas_install_joboptions( share/*.py )
+
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonDetMonitoring.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonDetMonitoring.py
index 068a2ec6c8dabc5ec48c3cf3de15c1a55e853a86..e93d692de27b510240448d8a0f1bdbd59783a12d 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonDetMonitoring.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonDetMonitoring.py
@@ -102,6 +102,8 @@ else:
 #----------------------#
 # Muon raw monitoring  #
 #----------------------#
+MuonRawMon=False
+MuonESDMon=False
 if DQMonFlags.monManEnvironment() == 'online':
     MuonRawMon=True
     MuonESDMon=True