diff --git a/src/main/java/de/extio/game_engine/keyboard/KeycodeAutoConfiguration.java b/src/main/java/de/extio/game_engine/keyboard/KeycodeAutoConfiguration.java
new file mode 100644
index 0000000..80f1d68
--- /dev/null
+++ b/src/main/java/de/extio/game_engine/keyboard/KeycodeAutoConfiguration.java
@@ -0,0 +1,15 @@
+package de.extio.game_engine.keyboard;
+
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+
+@AutoConfiguration
+@ConditionalOnProperty(name = "game-engine.keycode-registry.enabled", havingValue = "true", matchIfMissing = true)
+public class KeycodeAutoConfiguration {
+
+	@Bean
+	KeycodeRegistry keycodeRegistry() {
+		return new KeycodeRegistryImpl();
+	}
+}
diff --git a/src/main/java/de/extio/game_engine/keyboard/KeycodeRegistryImpl.java b/src/main/java/de/extio/game_engine/keyboard/KeycodeRegistryImpl.java
index 5a4ef24..6456288 100644
--- a/src/main/java/de/extio/game_engine/keyboard/KeycodeRegistryImpl.java
+++ b/src/main/java/de/extio/game_engine/keyboard/KeycodeRegistryImpl.java
@@ -6,9 +6,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.stereotype.Service;
-
-@Service
 public class KeycodeRegistryImpl implements KeycodeRegistry {
 	
 	private volatile Map<String, KeycodeRegistration> registry;