diff --git a/gradle.properties b/gradle.properties
index 297020b..14d59bd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,7 +18,7 @@ authors=Falkreon, acikek
 contributors=Trudle, Tomate0613, afamiliarquiet, FoundationGames, TheEpicBlock, hama
 license=MIT
 # Mod Version
-baseVersion=1.8.2-rc.6
+baseVersion=1.8.2-rc.7
 # Branch Metadata
 branch=1.21
 tagBranch=1.21
diff --git a/src/main/java/net/modfest/scatteredshards/api/ScatteredShardsAPI.java b/src/main/java/net/modfest/scatteredshards/api/ScatteredShardsAPI.java
index 5b87b62..fdf04d5 100644
--- a/src/main/java/net/modfest/scatteredshards/api/ScatteredShardsAPI.java
+++ b/src/main/java/net/modfest/scatteredshards/api/ScatteredShardsAPI.java
@@ -133,6 +133,7 @@ public static boolean triggerShardCollection(ServerPlayerEntity player, Identifi
 
 	// This overload is about a player in another server, i.e. from peer channel
 	public static boolean triggerShardCollection(UUID uuid, Identifier shardId) {
+		calculateShardProgress(); // It's possible for this to be called before any player joins
 		ShardCollection collection = getServerCollection(uuid);
 		if (collection.add(shardId)) {
 			serverGlobalCollection.update(shardId, 1, serverCollections.size());
@@ -165,6 +166,7 @@ public static boolean triggerShardUncollection(ServerPlayerEntity player, Identi
 
 	// This overload is about a player in another server, i.e. from peer channel
 	public static boolean triggerShardUncollection(UUID uuid, Identifier shardId) {
+		calculateShardProgress(); // It's possible for this to be called before any player joins
 		ShardCollection collection = getServerCollection(uuid);
 		if (collection.remove(shardId)) {
 			serverGlobalCollection.update(shardId, -1, serverCollections.size());