diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 677c9d0df717f84d5afde2dec8607d1ce144e64f..618912863566752eebc96a322d39df2a9805aefd 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -2204,6 +2204,7 @@ bool Item_sum_avg::resolve_type(THD *thd) {
     f_precision =
         min(precision + DECIMAL_LONGLONG_DIGITS, DECIMAL_MAX_PRECISION);
     f_scale = args[0]->decimals;
+    f_scale = min<uint>(f_precision, args[0]->decimals);
     dec_bin_size = my_decimal_get_binary_size(f_precision, f_scale);
   } else {
     assert(hybrid_type == REAL_RESULT);