diff --git a/src/main/java/gregtech/integration/hwyla/provider/ElectricContainerDataProvider.java b/src/main/java/gregtech/integration/hwyla/provider/ElectricContainerDataProvider.java
index 71c14e185f8..719fd15363e 100644
--- a/src/main/java/gregtech/integration/hwyla/provider/ElectricContainerDataProvider.java
+++ b/src/main/java/gregtech/integration/hwyla/provider/ElectricContainerDataProvider.java
@@ -3,6 +3,7 @@
 import gregtech.api.GTValues;
 import gregtech.api.capability.GregtechCapabilities;
 import gregtech.api.capability.IEnergyContainer;
+import gregtech.api.util.TextFormattingUtil;
 
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
@@ -59,7 +60,9 @@ public List<String> getWailaBody(ItemStack itemStack, List<String> tooltip, IWai
             NBTTagCompound energyTag = accessor.getNBTData().getCompoundTag("gregtech.IEnergyContainer");
             long stored = energyTag.getLong("Stored");
             long capacity = energyTag.getLong("Capacity");
-            tooltip.add(I18n.format("gregtech.waila.energy_stored", stored, capacity));
+            tooltip.add(I18n.format("gregtech.waila.energy_stored",
+                    TextFormattingUtil.formatNumbers(stored),
+                    TextFormattingUtil.formatNumbers(capacity)));
         }
         return tooltip;
     }
diff --git a/src/main/java/gregtech/integration/theoneprobe/provider/ElectricContainerInfoProvider.java b/src/main/java/gregtech/integration/theoneprobe/provider/ElectricContainerInfoProvider.java
index a15622a1160..b80350912d8 100644
--- a/src/main/java/gregtech/integration/theoneprobe/provider/ElectricContainerInfoProvider.java
+++ b/src/main/java/gregtech/integration/theoneprobe/provider/ElectricContainerInfoProvider.java
@@ -40,8 +40,11 @@ protected void addProbeInfo(@NotNull IEnergyContainer capability, @NotNull IProb
         long stored = capability.getEnergyStored();
         if (maxStorage == 0) return; // do not add empty max storage progress bar
         probeInfo.progress(capability.getEnergyStored(), maxStorage, probeInfo.defaultProgressStyle()
-                .numberFormat(player.isSneaking() || stored < 10000 ? NumberFormat.FULL : NumberFormat.COMPACT)
-                .suffix(" / " + (player.isSneaking() || maxStorage < 10000 ? maxStorage + " EU" :
+                .numberFormat(player.isSneaking() || stored < 10000 ?
+                        NumberFormat.COMMAS :
+                        NumberFormat.COMPACT)
+                .suffix(" / " + (player.isSneaking() || maxStorage < 10000 ?
+                        ElementProgress.format(maxStorage, NumberFormat.COMMAS, " EU") :
                         ElementProgress.format(maxStorage, NumberFormat.COMPACT, "EU")))
                 .filledColor(0xFFEEE600)
                 .alternateFilledColor(0xFFEEE600)
diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang
index 5c78797a406..e9fc2678ba0 100644
--- a/src/main/resources/assets/gregtech/lang/en_us.lang
+++ b/src/main/resources/assets/gregtech/lang/en_us.lang
@@ -119,7 +119,7 @@ option.gregtech.steam_boiler=Steam Boilers
 option.gregtech.transformer=Transformers
 option.gregtech.workable=Workable Machines
 
-gregtech.waila.energy_stored=Energy: %d EU / %d EU
+gregtech.waila.energy_stored=Energy: %s EU / %s EU
 gregtech.waila.progress_idle=Idle
 gregtech.waila.progress_tick=Progress: %d t / %d t
 gregtech.waila.progress_sec=Progress: %d s / %d s
diff --git a/src/main/resources/assets/gregtech/lang/ja_jp.lang b/src/main/resources/assets/gregtech/lang/ja_jp.lang
index e4024638d3f..a1ed0f8ebbc 100644
--- a/src/main/resources/assets/gregtech/lang/ja_jp.lang
+++ b/src/main/resources/assets/gregtech/lang/ja_jp.lang
@@ -109,7 +109,7 @@ gregtech.top.ld_pipe_output=搬出
 gregtech.top.ld_pipe_input_endpoint=搬入口:
 gregtech.top.ld_pipe_output_endpoint=搬出口:
 
-gregtech.waila.energy_stored=エネルギー: %d EU / %d EU
+gregtech.waila.energy_stored=エネルギー: %s EU / %s EU
 gregtech.waila.progress_idle=停止中
 gregtech.waila.progress_tick=進捗: %d t / %d t
 gregtech.waila.progress_sec=進捗: %d s / %d s
diff --git a/src/main/resources/assets/gregtech/lang/ru_ru.lang b/src/main/resources/assets/gregtech/lang/ru_ru.lang
index 32e4120f240..971b6fc8d3a 100644
--- a/src/main/resources/assets/gregtech/lang/ru_ru.lang
+++ b/src/main/resources/assets/gregtech/lang/ru_ru.lang
@@ -86,7 +86,7 @@ gregtech.top.ld_pipe_input=Ввод
 gregtech.top.ld_pipe_output=Вывод
 gregtech.top.ld_pipe_input_endpoint=Входная конечная точка:
 gregtech.top.ld_pipe_output_endpoint=Выходная конечная точка:
-gregtech.waila.energy_stored=Энергия: %d EU / %d EU
+gregtech.waila.energy_stored=Энергия: %s EU / %s EU
 gregtech.waila.progress_idle=Простой
 gregtech.waila.progress_tick=Прогресс: %d t / %d t
 gregtech.waila.progress_sec=Прогресс: %d s / %d s
diff --git a/src/main/resources/assets/gregtech/lang/zh_cn.lang b/src/main/resources/assets/gregtech/lang/zh_cn.lang
index f3bc63c1658..55dd3e25595 100644
--- a/src/main/resources/assets/gregtech/lang/zh_cn.lang
+++ b/src/main/resources/assets/gregtech/lang/zh_cn.lang
@@ -119,7 +119,7 @@ option.gregtech.steam_boiler=蒸汽锅炉
 option.gregtech.transformer=变压器
 option.gregtech.workable=机器工作状态
 
-gregtech.waila.energy_stored=能量：%d EU / %d EU
+gregtech.waila.energy_stored=能量：%s EU / %s EU
 gregtech.waila.progress_idle=闲置
 gregtech.waila.progress_tick=进度：%d t / %d t
 gregtech.waila.progress_sec=进度：%d s / %d s