diff --git a/include/maxscale/monitor.hh b/include/maxscale/monitor.hh
index 3c35dff8a..653a3d654 100644
--- a/include/maxscale/monitor.hh
+++ b/include/maxscale/monitor.hh
@@ -333,7 +333,7 @@ public:
      */
     const MXS_CONFIG_PARAMETER& parameters() const;
 
-    int64_t ticks() const;
+    long ticks() const;
 
     /**
      * Starts the monitor. If the monitor requires polling of the servers, it should create
@@ -556,7 +556,7 @@ protected:
     const Settings& settings() const;
 
     /**< Number of monitor ticks ran. Derived classes should increment this whenever completing a tick. */
-    std::atomic_int64_t m_ticks {0};
+    std::atomic_long m_ticks {0};
 
 private:
 
diff --git a/server/core/monitor.cc b/server/core/monitor.cc
index e35c6e0dd..25e61956a 100644
--- a/server/core/monitor.cc
+++ b/server/core/monitor.cc
@@ -596,7 +596,7 @@ const Monitor::Settings& Monitor::settings() const
     return m_settings;
 }
 
-int64_t Monitor::ticks() const
+long Monitor::ticks() const
 {
     return m_ticks.load(std::memory_order_acquire);
 }
@@ -669,7 +669,7 @@ void Monitor::show(DCB* dcb)
 {
     dcb_printf(dcb, "Name:                   %s\n", name());
     dcb_printf(dcb, "State:                  %s\n", monitor_state_to_string(state()));
-    dcb_printf(dcb, "Times monitored:        %lu\n", ticks());
+    dcb_printf(dcb, "Times monitored:        %li\n", ticks());
     dcb_printf(dcb, "Sampling interval:      %lu milliseconds\n", m_settings.interval);
     dcb_printf(dcb, "Connect Timeout:        %i seconds\n", m_settings.conn_settings.connect_timeout);
     dcb_printf(dcb, "Read Timeout:           %i seconds\n", m_settings.conn_settings.read_timeout);
diff --git a/server/core/monitormanager.cc b/server/core/monitormanager.cc
index a9d6bb847..6b6cdbd05 100644
--- a/server/core/monitormanager.cc
+++ b/server/core/monitormanager.cc
@@ -127,7 +127,7 @@ void MonitorManager::debug_wait_one_tick()
 {
     mxb_assert(Monitor::is_admin_thread());
     using namespace std::chrono;
-    std::map<Monitor*, int64_t> ticks;
+    std::map<Monitor*, long> ticks;
 
     // Get tick values for all monitors
     this_unit.foreach_monitor([&ticks](Monitor* mon) {