diff --git a/src/server/world/syncer.js b/src/server/world/syncer.js
index a75e4eb5..4b1affde 100644
--- a/src/server/world/syncer.js
+++ b/src/server/world/syncer.js
@@ -172,7 +172,11 @@ module.exports = {
 		for (let p in buffer) {
 			const list = buffer[p];
 
-			list.spliceWhere(l => l.to === targetServerId);
+			list.forEach(l => l.to.splice(f => f === targetServerId));
+			list.spliceWhere(l => !l.to.length);
+
+			if (!list.length)
+				delete buffer[p];
 		}
 	},