diff --git a/src/services/ConnectionService.java b/src/services/ConnectionService.java
index 1930f474..75470eae 100644
--- a/src/services/ConnectionService.java
+++ b/src/services/ConnectionService.java
@@ -210,7 +210,7 @@ public class ConnectionService implements INetworkDispatch {
 			object.setSpectatorTask(null);
 		}
 		
-		//core.groupService.handleGroupDisband(object); // Seefo: Temporarily moved to simulationService.handleDisconnect as a temporary fix for issue #295
+		core.groupService.handleGroupDisband(object);
 		
 		if (core.instanceService.isInInstance(object)) {
 			core.instanceService.remove(core.instanceService.getActiveInstance(object), object);
diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java
index 35e1c3f4..215491ea 100644
--- a/src/services/SimulationService.java
+++ b/src/services/SimulationService.java
@@ -755,8 +755,6 @@ public class SimulationService implements INetworkDispatch {
 			}
 		}
 		
-		core.groupService.handleGroupDisband(object); // Seefo: Temporarily moved from connectionService.disconnect as a temporary fix for issue #295
-		
 		/*
 		object.createTransaction(core.getCreatureODB().getEnvironment());
 		core.getCreatureODB().put(object, Long.class, CreatureObject.class, object.getTransaction());