diff --git a/app/Models/PollerCluster.php b/app/Models/PollerCluster.php
index 4478f83175..6f8fa3cd35 100644
--- a/app/Models/PollerCluster.php
+++ b/app/Models/PollerCluster.php
@@ -59,27 +59,27 @@ class PollerCluster extends Model
             [
                 'name' => 'poller_groups',
                 'default' => \LibreNMS\Config::get('distributed_poller_group'),
-                'value' => $poller->poller_groups ?? \LibreNMS\Config::get('distributed_poller_group'),
+                'value' => $this->poller_groups ?? \LibreNMS\Config::get('distributed_poller_group'),
                 'type' => 'multiple',
                 'options' => $groups,
             ],
             [
                 'name' => 'poller_enabled',
                 'default' => \LibreNMS\Config::get('service_poller_enabled'),
-                'value' => (bool)($poller->poller_enabled ?? \LibreNMS\Config::get('service_poller_enabled')),
+                'value' => (bool)($this->poller_enabled ?? \LibreNMS\Config::get('service_poller_enabled')),
                 'type' => 'boolean',
             ],
             [
                 'name' => 'poller_workers',
                 'default' => \LibreNMS\Config::get('service_poller_workers'),
-                'value' => $poller->poller_workers ?? \LibreNMS\Config::get('service_poller_workers'),
+                'value' => $this->poller_workers ?? \LibreNMS\Config::get('service_poller_workers'),
                 'type' => 'integer',
                 'units' => 'workers',
             ],
             [
                 'name' => 'poller_frequency',
                 'default' => \LibreNMS\Config::get('service_poller_frequency'),
-                'value' => $poller->poller_workers ?? \LibreNMS\Config::get('service_poller_frequency'),
+                'value' => $this->poller_workers ?? \LibreNMS\Config::get('service_poller_frequency'),
                 'type' => 'integer',
                 'units' => 'seconds',
                 'advanced' => true,
@@ -87,27 +87,27 @@ class PollerCluster extends Model
             [
                 'name' => 'poller_down_retry',
                 'default' => \LibreNMS\Config::get('service_poller_down_retry'),
-                'value' => $poller->poller_down_retry ?? \LibreNMS\Config::get('service_poller_down_retry'),
+                'value' => $this->poller_down_retry ?? \LibreNMS\Config::get('service_poller_down_retry'),
                 'type' => 'integer',
                 'units' => 'seconds',
             ],
             [
                 'name' => 'discovery_enabled',
                 'default' => \LibreNMS\Config::get('service_discovery_enabled'),
-                'value' => (bool)($poller->discovery_enabled ?? \LibreNMS\Config::get('service_discovery_enabled')),
+                'value' => (bool)($this->discovery_enabled ?? \LibreNMS\Config::get('service_discovery_enabled')),
                 'type' => 'boolean',
             ],
             [
                 'name' => 'discovery_workers',
                 'default' => \LibreNMS\Config::get('service_discovery_workers'),
-                'value' => $poller->discovery_workers ?? \LibreNMS\Config::get('service_discovery_workers'),
+                'value' => $this->discovery_workers ?? \LibreNMS\Config::get('service_discovery_workers'),
                 'type' => 'integer',
                 'units' => 'workers',
             ],
             [
                 'name' => 'discovery_frequency',
                 'default' => \LibreNMS\Config::get('service_discovery_frequency'),
-                'value' => $poller->discovery_frequency ?? \LibreNMS\Config::get('service_discovery_frequency'),
+                'value' => $this->discovery_frequency ?? \LibreNMS\Config::get('service_discovery_frequency'),
                 'type' => 'integer',
                 'units' => 'seconds',
                 'advanced' => true,
@@ -115,20 +115,20 @@ class PollerCluster extends Model
             [
                 'name' => 'services_enabled',
                 'default' => \LibreNMS\Config::get('service_services_enabled'),
-                'value' => (bool)($poller->services_enabled ?? \LibreNMS\Config::get('service_services_enabled')),
+                'value' => (bool)($this->services_enabled ?? \LibreNMS\Config::get('service_services_enabled')),
                 'type' => 'boolean',
             ],
             [
                 'name' => 'services_workers',
                 'default' => \LibreNMS\Config::get('service_services_workers'),
-                'value' => $poller->services_workers ?? \LibreNMS\Config::get('service_services_workers'),
+                'value' => $this->services_workers ?? \LibreNMS\Config::get('service_services_workers'),
                 'type' => 'integer',
                 'units' => 'workers',
             ],
             [
                 'name' => 'services_frequency',
                 'default' => \LibreNMS\Config::get('service_services_frequency'),
-                'value' => $poller->services_frequency ?? \LibreNMS\Config::get('service_services_frequency'),
+                'value' => $this->services_frequency ?? \LibreNMS\Config::get('service_services_frequency'),
                 'type' => 'integer',
                 'units' => 'seconds',
                 'advanced' => true,
@@ -136,13 +136,13 @@ class PollerCluster extends Model
             [
                 'name' => 'billing_enabled',
                 'default' => \LibreNMS\Config::get('service_billing_enabled'),
-                'value' => (bool)($poller->billing_enabled ?? \LibreNMS\Config::get('service_billing_enabled')),
+                'value' => (bool)($this->billing_enabled ?? \LibreNMS\Config::get('service_billing_enabled')),
                 'type' => 'boolean',
             ],
             [
                 'name' => 'billing_frequency',
                 'default' => \LibreNMS\Config::get('service_billing_frequency'),
-                'value' => $poller->billing_frequency ?? \LibreNMS\Config::get('service_billing_frequency'),
+                'value' => $this->billing_frequency ?? \LibreNMS\Config::get('service_billing_frequency'),
                 'type' => 'integer',
                 'units' => 'seconds',
                 'advanced' => true,
@@ -150,7 +150,7 @@ class PollerCluster extends Model
             [
                 'name' => 'billing_calculate_frequency',
                 'default' => \LibreNMS\Config::get('service_billing_calculate_frequency'),
-                'value' => $poller->billing_calculate_frequency ?? \LibreNMS\Config::get('service_billing_calculate_frequency'),
+                'value' => $this->billing_calculate_frequency ?? \LibreNMS\Config::get('service_billing_calculate_frequency'),
                 'type' => 'integer',
                 'units' => 'seconds',
                 'advanced' => true,
@@ -158,13 +158,13 @@ class PollerCluster extends Model
             [
                 'name' => 'alerting_enabled',
                 'default' => \LibreNMS\Config::get('service_alerting_enabled'),
-                'value' => (bool)($poller->alerting_enabled ?? \LibreNMS\Config::get('service_alerting_enabled')),
+                'value' => (bool)($this->alerting_enabled ?? \LibreNMS\Config::get('service_alerting_enabled')),
                 'type' => 'boolean',
             ],
             [
                 'name' => 'alerting_frequency',
                 'default' => \LibreNMS\Config::get('service_alerting_frequency'),
-                'value' => $poller->alerting_frequency ?? \LibreNMS\Config::get('service_alerting_frequency'),
+                'value' => $this->alerting_frequency ?? \LibreNMS\Config::get('service_alerting_frequency'),
                 'type' => 'integer',
                 'units' => 'seconds',
                 'advanced' => true,
@@ -172,13 +172,13 @@ class PollerCluster extends Model
             [
                 'name' => 'ping_enabled',
                 'default' => \LibreNMS\Config::get('service_ping_enabled'),
-                'value' => (bool)($poller->ping_enabled ?? \LibreNMS\Config::get('service_ping_enabled')),
+                'value' => (bool)($this->ping_enabled ?? \LibreNMS\Config::get('service_ping_enabled')),
                 'type' => 'boolean',
             ],
             [
                 'name' => 'ping_frequency',
                 'default' => \LibreNMS\Config::get('ping_rrd_step'),
-                'value' => $poller->ping_frequency ?? \LibreNMS\Config::get('ping_rrd_step'),
+                'value' => $this->ping_frequency ?? \LibreNMS\Config::get('ping_rrd_step'),
                 'type' => 'integer',
                 'units' => 'seconds',
                 'advanced' => true,
@@ -186,14 +186,14 @@ class PollerCluster extends Model
             [
                 'name' => 'update_enabled',
                 'default' => \LibreNMS\Config::get('service_update_enabled'),
-                'value' => (bool)($poller->update_enabled ?? \LibreNMS\Config::get('service_update_enabled')),
+                'value' => (bool)($this->update_enabled ?? \LibreNMS\Config::get('service_update_enabled')),
                 'type' => 'boolean',
                 'advanced' => true,
             ],
             [
                 'name' => 'update_frequency',
                 'default' => \LibreNMS\Config::get('service_update_frequency'),
-                'value' => $poller->update_frequency ?? \LibreNMS\Config::get('service_update_frequency'),
+                'value' => $this->update_frequency ?? \LibreNMS\Config::get('service_update_frequency'),
                 'type' => 'integer',
                 'units' => 'seconds',
                 'advanced' => true,
@@ -201,7 +201,7 @@ class PollerCluster extends Model
             [
                 'name' => 'loglevel',
                 'default' => \LibreNMS\Config::get('service_loglevel'),
-                'value' => $poller->loglevel ?? \LibreNMS\Config::get('service_loglevel'),
+                'value' => $this->loglevel ?? \LibreNMS\Config::get('service_loglevel'),
                 'type' => 'select',
                 'options' => [
                     'DEBUG' => 'DEBUG',
@@ -214,13 +214,13 @@ class PollerCluster extends Model
             [
                 'name' => 'watchdog_enabled',
                 'default' => \LibreNMS\Config::get('service_watchdog_enabled'),
-                'value' => (bool)($poller->watchdog_enabled ?? \LibreNMS\Config::get('service_watchdog_enabled')),
+                'value' => (bool)($this->watchdog_enabled ?? \LibreNMS\Config::get('service_watchdog_enabled')),
                 'type' => 'boolean',
             ],
             [
                 'name' => 'watchdog_log',
                 'default' => \LibreNMS\Config::get('log_file'),
-                'value' => $poller->watchdog_log ?? \LibreNMS\Config::get('log_file'),
+                'value' => $this->watchdog_log ?? \LibreNMS\Config::get('log_file'),
                 'type' => 'text',
                 'advanced' => true,
             ],