diff --git a/src/main/java/de/extio/game_engine/module/ModuleServiceAutoConfiguration.java b/src/main/java/de/extio/game_engine/module/ModuleServiceAutoConfiguration.java
index 4ef106f..8104e05 100644
--- a/src/main/java/de/extio/game_engine/module/ModuleServiceAutoConfiguration.java
+++ b/src/main/java/de/extio/game_engine/module/ModuleServiceAutoConfiguration.java
@@ -6,6 +6,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 
+import de.extio.game_engine.event.EventService;
 import de.extio.game_engine.renderer.work.RendererWorkingSet;
 
 @AutoConfiguration
@@ -14,8 +15,8 @@ public class ModuleServiceAutoConfiguration {
 	
 	@Bean
 	@ConditionalOnMissingBean
-	ModuleService moduleService(final ApplicationContext applicationContext, final RendererWorkingSet rendererWorkingSet) {
-		return new ModuleServiceImpl(applicationContext, rendererWorkingSet);
+	ModuleService moduleService(final ApplicationContext applicationContext, final RendererWorkingSet rendererWorkingSet, final EventService eventService) {
+		return new ModuleServiceImpl(applicationContext, rendererWorkingSet, eventService);
 	}
 	
 	@Bean
diff --git a/src/main/java/de/extio/game_engine/module/ModuleServiceImpl.java b/src/main/java/de/extio/game_engine/module/ModuleServiceImpl.java
index 6423615..1061936 100644
--- a/src/main/java/de/extio/game_engine/module/ModuleServiceImpl.java
+++ b/src/main/java/de/extio/game_engine/module/ModuleServiceImpl.java
@@ -17,6 +17,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
 
+import de.extio.game_engine.event.EventService;
 import de.extio.game_engine.renderer.work.RendererWorkingSet;
 
 public class ModuleServiceImpl implements ModuleService, ApplicationListener<ContextRefreshedEvent> {
@@ -30,6 +31,8 @@ public class ModuleServiceImpl implements ModuleService, ApplicationListener<Con
 	private final Map<String, AbstractModule> modulesByIdMap = new ConcurrentHashMap<>();
 	
 	private final RendererWorkingSet rendererWorkingSet;
+
+	private final EventService eventService;
 	
 	private List<AbstractModule> modulesAllView = List.of();
 	
@@ -47,9 +50,10 @@ public class ModuleServiceImpl implements ModuleService, ApplicationListener<Con
 	
 	private final Map<ModuleExecutorCallbacks, List<AbstractModule>> executorCallbackMap = Collections.synchronizedMap(new EnumMap<>(ModuleExecutorCallbacks.class));
 	
-	public ModuleServiceImpl(ApplicationContext applicationContext, final RendererWorkingSet rendererWorkingSet) {
+	public ModuleServiceImpl(ApplicationContext applicationContext, final RendererWorkingSet rendererWorkingSet, final EventService eventService) {
 		this.applicationContext = applicationContext;
 		this.rendererWorkingSet = rendererWorkingSet;
+		this.eventService = eventService;
 	}
 
 	
@@ -123,6 +127,8 @@ public class ModuleServiceImpl implements ModuleService, ApplicationListener<Con
 			}
 			
 			this.invokeSafe(module, m -> m.onUnload());
+			
+			this.eventService.unregisterAll(module.getId());
 			if (module instanceof final AbstractClientModule clientModule) {
 				this.rendererWorkingSet.clear(clientModule.getId());
 			}
@@ -153,6 +159,7 @@ public class ModuleServiceImpl implements ModuleService, ApplicationListener<Con
 									.map(m -> (AbstractClientModule) m)
 									.toList();
 						}
+						this.eventService.unregisterAll(module.getId());
 						if (module instanceof final AbstractClientModule clientModule) {
 							this.rendererWorkingSet.clear(clientModule.getId());
 						}
@@ -164,6 +171,7 @@ public class ModuleServiceImpl implements ModuleService, ApplicationListener<Con
 								}
 							}
 						}
+						
 						this.invokeSafe(module, AbstractModule::onDeactivate);
 						
 						LOGGER.info("Deactivated {}", id);
diff --git a/src/main/java/de/extio/game_engine/renderer/container/Container.java b/src/main/java/de/extio/game_engine/renderer/container/Container.java
index 1fa55bc..c503640 100644
--- a/src/main/java/de/extio/game_engine/renderer/container/Container.java
+++ b/src/main/java/de/extio/game_engine/renderer/container/Container.java
@@ -70,7 +70,7 @@ public class Container extends AbstractClientModule implements InitializingBean
 	
 	@Override
 	public void onDeactivate() {
-		this.eventService.unregister(ViewportResizeEvent.class, this.id);
+		
 	}
 	
 	protected void onViewportResize(final ViewportResizeEvent event) {
diff --git a/src/test/java/de/extio/game_engine/module/ModuleServiceTest.java b/src/test/java/de/extio/game_engine/module/ModuleServiceTest.java
index a48309c..89bb274 100644
--- a/src/test/java/de/extio/game_engine/module/ModuleServiceTest.java
+++ b/src/test/java/de/extio/game_engine/module/ModuleServiceTest.java
@@ -2,6 +2,7 @@ package de.extio.game_engine.module;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.List;
@@ -12,6 +13,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.ContextRefreshedEvent;
 
+import de.extio.game_engine.event.EventService;
 import de.extio.game_engine.renderer.work.RendererWorkingSet;
 
 public class ModuleServiceTest {
@@ -22,16 +24,19 @@ public class ModuleServiceTest {
 	
 	private TestClientModule testClientModule;
 	
+	private EventService eventService;
+	
 	@BeforeEach
 	public void setUp() throws Exception {
 		this.testModule = new TestModule();
 		this.testClientModule = new TestClientModule();
+		this.eventService = mock(EventService.class);
 		
 		final ApplicationContext ctx = mock(ApplicationContext.class);
 		when(ctx.getBeansOfType(AbstractModule.class, false, false))
 			.thenReturn(Map.of("testModule", this.testModule, "testClientModule", this.testClientModule));
 		
-		this.moduleManager = new ModuleServiceImpl(ctx, mock(RendererWorkingSet.class));
+		this.moduleManager = new ModuleServiceImpl(ctx, mock(RendererWorkingSet.class), this.eventService);
 		this.moduleManager.onApplicationEvent(new ContextRefreshedEvent(ctx));
 	}
 	
@@ -46,7 +51,7 @@ public class ModuleServiceTest {
 	public void testOnApplicationEvent_EmptyModules() throws Exception {
 		final ApplicationContext ctx = mock(ApplicationContext.class);
 		when(ctx.getBeansOfType(AbstractModule.class, false, false)).thenReturn(Map.of());
-		final ModuleServiceImpl emptyManager = new ModuleServiceImpl(ctx, mock(RendererWorkingSet.class));
+		final ModuleServiceImpl emptyManager = new ModuleServiceImpl(ctx, mock(RendererWorkingSet.class), mock(EventService.class));
 		emptyManager.onApplicationEvent(new ContextRefreshedEvent(ctx));
 		
 		assertTrue(emptyManager.getModulesAll().isEmpty());
@@ -56,7 +61,7 @@ public class ModuleServiceTest {
 	public void testOnApplicationEvent_NullModules() throws Exception {
 		final ApplicationContext ctx = mock(ApplicationContext.class);
 		when(ctx.getBeansOfType(AbstractModule.class, false, false)).thenReturn(null);
-		final ModuleServiceImpl nullManager = new ModuleServiceImpl(ctx, mock(RendererWorkingSet.class));
+		final ModuleServiceImpl nullManager = new ModuleServiceImpl(ctx, mock(RendererWorkingSet.class), mock(EventService.class));
 		nullManager.onApplicationEvent(new ContextRefreshedEvent(ctx));
 		
 		assertTrue(nullManager.getModulesAll().isEmpty());
@@ -103,6 +108,13 @@ public class ModuleServiceTest {
 		assertTrue(this.testModule.onUnloadCalled);
 	}
 	
+	@Test
+	public void testUnloadModule_UnregistersEvents() {
+		this.moduleManager.unloadModule(this.testModule.getId());
+		
+		verify(this.eventService).unregisterAll(this.testModule.getId());
+	}
+	
 	@Test
 	public void testUnloadModule_NotLoaded() {
 		final int initialSize = this.moduleManager.getModulesAll().size();
@@ -142,6 +154,14 @@ public class ModuleServiceTest {
 		assertTrue(this.testModule.onDeactivateCalled);
 	}
 	
+	@Test
+	public void testDeactivate_UnregistersEvents() {
+		this.moduleManager.changeActiveState(this.testModule.getId(), true);
+		this.moduleManager.changeActiveState(this.testModule.getId(), false);
+		
+		verify(this.eventService).unregisterAll(this.testModule.getId());
+	}
+	
 	@Test
 	public void testChangeActiveState_AlreadyActive() {
 		this.moduleManager.changeActiveState(this.testModule.getId(), true);