diff --git a/server/core/config_runtime.cc b/server/core/config_runtime.cc
index 623bcceed..332ecdd56 100644
--- a/server/core/config_runtime.cc
+++ b/server/core/config_runtime.cc
@@ -763,10 +763,10 @@ bool runtime_alter_maxscale(const char* name, const char* value)
             if (cnf.passive && !boolval)
             {
                 // This MaxScale is being promoted to the active instance
-                atomic_store_int64(&cnf.promoted_at, hkheartbeat);
+                cnf.promoted_at = hkheartbeat;
             }
 
-            atomic_store_int32(&cnf.passive, boolval);
+            cnf.passive = boolval;
             rval = true;
         }
         else
diff --git a/server/core/monitor.cc b/server/core/monitor.cc
index 5d902b716..ddc4b9818 100644
--- a/server/core/monitor.cc
+++ b/server/core/monitor.cc
@@ -1758,7 +1758,7 @@ void mon_process_state_changes(MXS_MONITOR *monitor, const char *script, uint64_
             mxs_monitor_event_t event = mon_get_event_type(ptr);
             ptr->server->last_event = event;
             ptr->server->triggered_at = hkheartbeat;
-            ptr->server->active_event = !atomic_load_int32(&config_get_global_options()->passive);
+            ptr->server->active_event = !config_get_global_options()->passive;
             ptr->new_event = true;
             mon_log_state_change(ptr);