diff --git a/src/agent.c b/src/agent.c
index 74bbc64..4ee1877 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -934,6 +934,9 @@ static DBusMessage *register_agent(DBusConnection *conn,
 
 	g_hash_table_replace(agent_list, agent->owner, agent);
 
+	if (default_agent == NULL)
+		set_default_agent(agent);
+
 	return dbus_message_new_method_return(msg);
 }