diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6aa6e3b0b..bd46934d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 - core: fix write of weechat.log to stdout with `weechat-headless --stdout` ([#2247](https://github.com/weechat/weechat/issues/2247))
 - core: add refresh of window title on buffer switch, when option weechat.look.window_title is set
 - core: consider all keys are safe in cursor context ([#2244](https://github.com/weechat/weechat/issues/2244))
+- core: fix integer overflow with decimal numbers in calculation of expression
 - irc: display nick changes and quit messages when option irc.look.ignore_tag_messages is enabled ([#2241](https://github.com/weechat/weechat/issues/2241))
 - perl: fix build when multiplicity is not available ([#2243](https://github.com/weechat/weechat/issues/2243))
 
diff --git a/src/core/core-calc.c b/src/core/core-calc.c
index 411107e2c..df89bc430 100644
--- a/src/core/core-calc.c
+++ b/src/core/core-calc.c
@@ -338,9 +338,9 @@ calc_expression (const char *expr)
     struct t_arraylist *list_values, *list_ops;
     const char *ptr_expr, *ptr_expr2;
     char str_result[64], *ptr_operator, *operator;
-    int index_op, decimals;
+    int index_op;
     enum t_calc_symbol last_symbol;
-    double value, factor, *ptr_value;
+    double value, factor, decimals, *ptr_value;
 
     list_values = NULL;
     list_ops = NULL;