diff --git a/frigate/comms/dispatcher.py b/frigate/comms/dispatcher.py
index 1ce99f7e3..6da154814 100644
--- a/frigate/comms/dispatcher.py
+++ b/frigate/comms/dispatcher.py
@@ -108,7 +108,7 @@ class Dispatcher:
             camera_name: str,
             command: str,
             payload: str,
-            sub_command: str = None,
+            sub_command: str | None = None,
         ) -> None:
             try:
                 if command_type == "set":
diff --git a/frigate/comms/mqtt.py b/frigate/comms/mqtt.py
index b59a4bec3..9279b4388 100644
--- a/frigate/comms/mqtt.py
+++ b/frigate/comms/mqtt.py
@@ -133,19 +133,19 @@ class MqttClient(Communicator):
                 retain=True,
             )
 
-            for mask_name, mask in camera.motion.mask.items():
-                if mask:
+            for mask_name, motion_mask in camera.motion.mask.items():
+                if motion_mask:
                     self.publish(
                         f"{camera_name}/motion_mask/{mask_name}/state",
-                        "ON" if mask.enabled else "OFF",
+                        "ON" if motion_mask.enabled else "OFF",
                         retain=True,
                     )
 
-            for mask_name, mask in camera.objects.mask.items():
-                if mask:
+            for mask_name, object_mask in camera.objects.mask.items():
+                if object_mask:
                     self.publish(
                         f"{camera_name}/object_mask/{mask_name}/state",
-                        "ON" if mask.enabled else "OFF",
+                        "ON" if object_mask.enabled else "OFF",
                         retain=True,
                     )