diff --git a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/HologramConfiguration.java b/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/HologramConfiguration.java
index 2a9cda94..d0a5e868 100644
--- a/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/HologramConfiguration.java
+++ b/plugins/fancyholograms/fh-api/src/main/java/de/oliver/fancyholograms/api/HologramConfiguration.java
@@ -51,6 +51,13 @@ public interface HologramConfiguration {
      */
     String getLogLevel();
 
+    /**
+     * Returns the language used by the plugin.
+     *
+     * @return The language used by the plugin.
+     */
+    String getLanguage();
+
     /**
      * Returns whether holograms should be shown to bedrock players.
      *
@@ -66,9 +73,9 @@ public interface HologramConfiguration {
     boolean isHologramsForOldClientsEnabled();
 
     /**
-     * Returns the language used by the plugin.
+     * Returns whether the plugin uses lamp commands.
      *
-     * @return The language used by the plugin.
+     * @return {@code true} if the plugin uses lamp commands, {@code false} otherwise.
      */
-    String getLanguage();
+    boolean useLampCommands();
 }
diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/config/FHConfiguration.java b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/config/FHConfiguration.java
index bbf4d233..d5de95b0 100644
--- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/config/FHConfiguration.java
+++ b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/config/FHConfiguration.java
@@ -22,6 +22,7 @@ public final class FHConfiguration implements HologramConfiguration {
 
     public static final String DISABLE_HOLOGRAMS_FOR_BEDROCK_PLAYERS_PATH = "experimental_features.disable_holograms_for_bedrock_players";
     public static final String DISABLE_HOLOGRAMS_FOR_OLD_CLIENTS = "experimental_features.disable_holograms_for_old_clients";
+    public static final String USE_LAMP_COMMANDS = "experimental_features.use_lamp_commands";
 
     private static final String CONFIG_FILE_PATH = "plugins/FancyHolograms/config.yml";
     private Config config;
@@ -92,6 +93,15 @@ public final class FHConfiguration implements HologramConfiguration {
                 Boolean.class
         ));
 
+        config.addField(new ConfigField<>(
+                LANGUAGE_PATH,
+                "The language to use for the plugin.",
+                false,
+                "default",
+                false,
+                String.class
+        ));
+
         /*
             FEATURE FLAGS
          */
@@ -115,12 +125,12 @@ public final class FHConfiguration implements HologramConfiguration {
         ));
 
         config.addField(new ConfigField<>(
-                LANGUAGE_PATH,
-                "The language to use for the plugin.",
+                USE_LAMP_COMMANDS,
+                "Use the new commands made with the Lamp framework.",
                 false,
-                "default",
                 false,
-                String.class
+                false,
+                Boolean.class
         ));
 
         config.reload();
@@ -169,6 +179,11 @@ public final class FHConfiguration implements HologramConfiguration {
         return config.get(LOG_LEVEL_PATH);
     }
 
+    @Override
+    public String getLanguage() {
+        return config.get(LANGUAGE_PATH);
+    }
+
     @Override
     public boolean isHologramsForBedrockPlayersEnabled() {
         return !(boolean) config.get(DISABLE_HOLOGRAMS_FOR_BEDROCK_PLAYERS_PATH);
@@ -180,7 +195,7 @@ public final class FHConfiguration implements HologramConfiguration {
     }
 
     @Override
-    public String getLanguage() {
-        return config.get(LANGUAGE_PATH);
+    public boolean useLampCommands() {
+        return config.get(USE_LAMP_COMMANDS);
     }
 }
diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsPlugin.java b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsPlugin.java
index 40b16221..6fd42cd2 100644
--- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsPlugin.java
+++ b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsPlugin.java
@@ -195,8 +195,12 @@ public final class FancyHologramsPlugin extends JavaPlugin implements FancyHolog
     public void onEnable() {
         new FancyLib(INSTANCE);
 
-        registerCommands();
-        registerLampCommands();
+        if (configuration.useLampCommands()) {
+            registerLampCommands();
+        } else {
+            registerCommands();
+        }
+
         registerListeners();
 
         versionConfig.load();