diff --git a/gio/gdbusnameowning.c b/gio/gdbusnameowning.c
index 791d2f5ab..0ddfafc92 100644
--- a/gio/gdbusnameowning.c
+++ b/gio/gdbusnameowning.c
@@ -650,6 +650,7 @@ g_bus_own_name (GBusType                  bus_type,
   if (map_id_to_client == NULL)
     {
       map_id_to_client = g_hash_table_new (g_direct_hash, g_direct_equal);
+      G_CLEANUP_IN (map_id_to_client, g_hash_table_unref, G_CLEANUP_PHASE_LATE);
     }
   g_hash_table_insert (map_id_to_client,
                        GUINT_TO_POINTER (client->id),
diff --git a/gio/gdbusnamewatching.c b/gio/gdbusnamewatching.c
index 12e8ed762..77a1b52b2 100644
--- a/gio/gdbusnamewatching.c
+++ b/gio/gdbusnamewatching.c
@@ -574,6 +574,7 @@ g_bus_watch_name (GBusType                  bus_type,
   if (map_id_to_client == NULL)
     {
       map_id_to_client = g_hash_table_new (g_direct_hash, g_direct_equal);
+      G_CLEANUP_IN (map_id_to_client, g_hash_table_unref, G_CLEANUP_PHASE_LATE);
     }
   g_hash_table_insert (map_id_to_client,
                        GUINT_TO_POINTER (client->id),