diff --git a/lib/icingadb/icingadb-objects.cpp b/lib/icingadb/icingadb-objects.cpp
index 5b9e252c1..ae9d93344 100644
--- a/lib/icingadb/icingadb-objects.cpp
+++ b/lib/icingadb/icingadb-objects.cpp
@@ -44,18 +44,23 @@ INITIALIZE_ONCE(&IcingaDB::ConfigStaticInitialize);
 
 std::vector<Type::Ptr> IcingaDB::GetTypes()
 {
+	// The initial config sync will queue the types in the following order.
 	return {
-		CheckCommand::TypeInstance,
-		Comment::TypeInstance,
+		// Sync them first to get their states ASAP.
+		Host::TypeInstance,
+		Service::TypeInstance,
+
+		// Then sync them for similar reasons.
 		Downtime::TypeInstance,
+		Comment::TypeInstance,
+
+		HostGroup::TypeInstance,
+		ServiceGroup::TypeInstance,
+		CheckCommand::TypeInstance,
 		Endpoint::TypeInstance,
 		EventCommand::TypeInstance,
-		Host::TypeInstance,
-		HostGroup::TypeInstance,
 		Notification::TypeInstance,
 		NotificationCommand::TypeInstance,
-		Service::TypeInstance,
-		ServiceGroup::TypeInstance,
 		TimePeriod::TypeInstance,
 		User::TypeInstance,
 		UserGroup::TypeInstance,