diff --git a/src/main.c b/src/main.c
index 6a6b9f5417..6c3e70b865 100644
--- a/src/main.c
+++ b/src/main.c
@@ -420,11 +420,7 @@ main (int argc, char *argv[])
 	/* Set up platform interaction layer */
 	nm_linux_platform_setup ();
 
-	/* FIXME: intentionally leak the singleton instance of NMPlatform.
-	 * nm_linux_platform_setup() will register the singleton for destruction,
-	 * but we don't yet shut down all singletons properly, so don't destroy
-	 * NMPlatform. */
-	g_object_ref (NM_PLATFORM_GET);
+	NM_UTILS_KEEP_ALIVE (config, NM_PLATFORM_GET, "NMConfig-depends-on-NMPlatform");
 
 	nm_dispatcher_init ();