diff --git a/src/Extensions/Hardware.bonsai b/src/Extensions/Hardware.bonsai
index c1730e2..70a5223 100644
--- a/src/Extensions/Hardware.bonsai
+++ b/src/Extensions/Hardware.bonsai
@@ -196,7 +196,7 @@
               <Name>RigSchema</Name>
             </Expression>
             <Expression xsi:type="MemberSelector">
-              <Selector>HarpSniffDetector</Selector>
+              <Selector>HarpEnvironmentSensor</Selector>
             </Expression>
             <Expression xsi:type="IncludeWorkflow" Path="AllenNeuralDynamics.Core:FilterNotNull.bonsai" />
             <Expression xsi:type="Combinator">
diff --git a/src/aind_behavior_dynamic_foraging/data_qc/suite.py b/src/aind_behavior_dynamic_foraging/data_qc/suite.py
index b0602f7..a0033ae 100644
--- a/src/aind_behavior_dynamic_foraging/data_qc/suite.py
+++ b/src/aind_behavior_dynamic_foraging/data_qc/suite.py
@@ -68,12 +68,14 @@ def make_qc_runner(dataset: contract.Dataset) -> qc.Runner:
             "HarpEnvironmentSensor",
         )
 
-    _runner.add_suite(
-        qc.harp.HarpLicketySplitTestSuite(dataset["Behavior"]["HarpLickometerRight"]), "HarpLickometerRight"
-    )
-    _runner.add_suite(
-        qc.harp.HarpLicketySplitTestSuite(dataset["Behavior"]["HarpLickometerLeft"]), "HarpLickometerLeft"
-    )
+    if rig.harp_lickometer_right is not None:
+        _runner.add_suite(
+            qc.harp.HarpLicketySplitTestSuite(dataset["Behavior"]["HarpLickometerRight"]), "HarpLickometerRight"
+        )
+    if rig.harp_lickometer_left is not None:
+        _runner.add_suite(
+            qc.harp.HarpLicketySplitTestSuite(dataset["Behavior"]["HarpLickometerLeft"]), "HarpLickometerLeft"
+        )
 
     # Add camera qc
     for camera in dataset["BehaviorVideos"]: