diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index 0bf6c47bf..648f5d1de 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -175,4 +175,5 @@ v 2.0:
 	- Startup errors will now lock out ALL commands other than '/manload'
 	- Fix 'manuadd' to use the default or selected world (via 'manselect'), if the world is not specified in the command.
 	- Expand GlobalGroups.yml and groups.yml to cover the VanishNoPacket plugin. Demonstrating how to negate and add nodes when using the '*' permission with inheritance.
-	- Fix silly nested throw/catch statements. Errors are now correctly generated when reading yml's.
\ No newline at end of file
+	- Fix silly nested throw/catch statements. Errors are now correctly generated when reading yml's.
+	- Unregister the worldsHolder as a service on a reload/shutdown instead of the whole plugin.
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
index 1177e3357..1c4011ff8 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
@@ -98,7 +98,7 @@ public class GroupManager extends JavaPlugin {
 		setLoaded(false);
 		
 		// Un-register this service.
-		this.getServer().getServicesManager().unregister(this);
+		this.getServer().getServicesManager().unregister(this.worldsHolder);
 
 		disableScheduler(); // Shutdown before we save, so it doesn't interfere.
 		if (worldsHolder != null) {