diff --git a/src/main/java/bentobox/addon/challenges/listeners/SaveListener.java b/src/main/java/bentobox/addon/challenges/listeners/SaveListener.java
index 2e1a821..0b43895 100644
--- a/src/main/java/bentobox/addon/challenges/listeners/SaveListener.java
+++ b/src/main/java/bentobox/addon/challenges/listeners/SaveListener.java
@@ -23,7 +23,10 @@ public class SaveListener implements Listener
 	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 	public void onWorldSave(WorldSaveEvent e)
 	{
-		this.addon.getChallengesManager().save(e.isAsynchronous());
+		if (!this.addon.getChallengesManager().getAllChallengesList(e.getWorld()).isEmpty())
+		{
+			this.addon.getChallengesManager().save(e.isAsynchronous());
+		}
 	}