diff --git a/src/etc/rc.syshook.d/monitor/20-recover b/src/etc/rc.syshook.d/monitor/20-recover
index b70870d0c..075e56a8c 100755
--- a/src/etc/rc.syshook.d/monitor/20-recover
+++ b/src/etc/rc.syshook.d/monitor/20-recover
@@ -30,6 +30,7 @@
 require_once 'config.inc';
 require_once 'util.inc';
 require_once 'system.inc';
+require_once 'interfaces.inc';
 
 $gwnames = [];
 
diff --git a/src/opnsense/scripts/routes/gateway_watcher.php b/src/opnsense/scripts/routes/gateway_watcher.php
index a81080484..330596835 100755
--- a/src/opnsense/scripts/routes/gateway_watcher.php
+++ b/src/opnsense/scripts/routes/gateway_watcher.php
@@ -64,6 +64,8 @@ while (1) {
         continue;
     }
 
+    $alarm = false;
+
     /* clear known gateways in first step to flush unknown in second step */
     $cleanup = $mode;
     foreach ($status as $report) {
@@ -75,8 +77,6 @@ while (1) {
 
     /* run main watcher pass */
     foreach ($status as $report) {
-        $alarm = false;
-
         if ($report['loss'] == '~') {
             /* wait for valid data before triggering an alarm */
             continue;