diff --git a/selfdrive/car/fw_versions.py b/selfdrive/car/fw_versions.py
index 0fc524d1b1..19370d1bfe 100755
--- a/selfdrive/car/fw_versions.py
+++ b/selfdrive/car/fw_versions.py
@@ -29,13 +29,9 @@ def chunks(l, n=128):
 def build_fw_dict(fw_versions, filter_brand=None):
   fw_versions_dict = defaultdict(set)
   for fw in fw_versions:
-    if fw.logging:
-      continue
-    if filter_brand is not None and fw.brand != filter_brand:
-      continue
-    addr = fw.address
-    sub_addr = fw.subAddress if fw.subAddress != 0 else None
-    fw_versions_dict[(addr, sub_addr)].add(fw.fwVersion)
+    if (filter_brand is None or fw.brand == filter_brand) and not fw.logging:
+      sub_addr = fw.subAddress if fw.subAddress != 0 else None
+      fw_versions_dict[(fw.address, sub_addr)].add(fw.fwVersion)
   return dict(fw_versions_dict)