diff --git a/selfdrive/pandad/pandad.py b/selfdrive/pandad/pandad.py
index 3c01a2ec03..ab1085c764 100755
--- a/selfdrive/pandad/pandad.py
+++ b/selfdrive/pandad/pandad.py
@@ -120,13 +120,13 @@ def main() -> None:
         time.sleep(1)
 
       panda_serials = Panda.list()
+      # flash and filter out Rivian longitudinal before stock logic
+      panda_serials = flash_rivian_long(panda_serials)
+
       if len(panda_serials) == 0:
         no_internal_panda_count += 1
         continue
 
-      # flash and filter out Rivian longitudinal before stock logic
-      panda_serials = flash_rivian_long(panda_serials)
-
       cloudlog.info(f"{len(panda_serials)} panda(s) found, connecting - {panda_serials}")
 
       # Flash the first panda