diff --git a/src/nm-session-monitor.c b/src/nm-session-monitor.c
index 691b3a724c..050dae0e79 100644
--- a/src/nm-session-monitor.c
+++ b/src/nm-session-monitor.c
@@ -278,16 +278,9 @@ ck_finalize (NMSessionMonitor *monitor)
 
 /********************************************************************/
 
-static NMSessionMonitor *
-nm_session_monitor_get (void)
-{
-	static NMSessionMonitor *singleton = NULL;
+NMSessionMonitor *nm_session_monitor_get(void);
 
-	if (!singleton)
-		singleton = NM_SESSION_MONITOR (g_object_new (NM_TYPE_SESSION_MONITOR, NULL));
-
-	return singleton;
-}
+NM_DEFINE_SINGLETON_GETTER (NMSessionMonitor, nm_session_monitor_get, NM_TYPE_SESSION_MONITOR);
 
 /**
  * nm_session_monitor_connect: