diff --git a/CHANGELOG.md b/CHANGELOG.md
index a98e34f0e..bded718c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Increased the maximum number of user-defined temperaments to 999 https://github.com/GrandOrgue/grandorgue/issues/1982
 # 3.15.4 (2024-12-20)
 - Eliminated a MacOs debug alert when opening a settings dialog https://github.com/GrandOrgue/grandorgue/issues/2003
 - Fixed not releasing a pipe after fast switching between vave-based tremulant samples and regular pipe samples https://github.com/GrandOrgue/grandorgue/issues/2004
diff --git a/src/core/go_limits.h b/src/core/go_limits.h
index f544ef3dd..1bbb10b73 100644
--- a/src/core/go_limits.h
+++ b/src/core/go_limits.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -13,6 +13,6 @@
 #define MAX_POLYPHONY 100000
 #define MAX_MIDI_DEVICES 50000
 #define MAX_SAMPLE_LENGTH 158760000
-#define MAX_TEMPERAMENTS 10
+#define MAX_TEMPERAMENTS 999 // limited by the format of setting keys
 
 #endif