diff --git a/src/main/kotlin/fr/lucasdupont/configuration/JdaConfiguration.kt b/src/main/kotlin/fr/lucasdupont/configuration/JdaConfiguration.kt
index 1e67b75..4df2864 100644
--- a/src/main/kotlin/fr/lucasdupont/configuration/JdaConfiguration.kt
+++ b/src/main/kotlin/fr/lucasdupont/configuration/JdaConfiguration.kt
@@ -10,4 +10,5 @@ class JdaConfiguration {
     var onlineStatus: OnlineStatus = OnlineStatus.ONLINE
     var cacheFlags: Set<CacheFlag> = emptySet()
     var activity: String? = null
+    var guildId: String? = null
 }
\ No newline at end of file
diff --git a/src/main/kotlin/fr/lucasdupont/service/JdaService.kt b/src/main/kotlin/fr/lucasdupont/service/JdaService.kt
index 696a285..c522c27 100644
--- a/src/main/kotlin/fr/lucasdupont/service/JdaService.kt
+++ b/src/main/kotlin/fr/lucasdupont/service/JdaService.kt
@@ -55,9 +55,16 @@ class JdaService(
 
         val commandDataList = contextCommands.map { it.toCommandData() }
 
-        jda.updateCommands()
-            .addCommands(commandDataList)
-            .queue()
+        if (jdaConfiguration.guildId != null) {
+            jda.getGuildById(jdaConfiguration.guildId!!)
+                ?.updateCommands()
+                ?.addCommands(commandDataList)
+                ?.queue()
+        } else {
+            jda.updateCommands()
+                .addCommands(commandDataList)
+                .queue()
+        }
     }
 
     @EventListener(SlashCommandInteractionEvent::class)