diff --git a/src/init.cpp b/src/init.cpp
index 7b6c69739..ed6fe29f7 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -594,9 +594,6 @@ bool Anope::Init(int ac, char **av)
 
 	FOREACH_MOD(OnPostInit, ());
 
-	for (const auto &[_, ci] : ChannelList)
-		ci->Sync();
-
 	Serialize::CheckTypes();
 	return true;
 }
diff --git a/src/servers.cpp b/src/servers.cpp
index 678a5fa8d..d0ce02122 100644
--- a/src/servers.cpp
+++ b/src/servers.cpp
@@ -288,6 +288,12 @@ void Server::Sync(bool sync_links)
 
 		FOREACH_MOD(OnUplinkSync, (this));
 
+		for (const auto &[_, c] : ChannelList)
+		{
+			if (c->syncing)
+				c->Sync();
+		}
+
 		if (!Anope::NoFork)
 		{
 			Log(LOG_TERMINAL) << "Successfully linked, launching into background...";