diff --git a/megameklab/src/megameklab/ui/generalUnit/StatusBar.java b/megameklab/src/megameklab/ui/generalUnit/StatusBar.java
index 3e3d242b5..8cf0b50dd 100644
--- a/megameklab/src/megameklab/ui/generalUnit/StatusBar.java
+++ b/megameklab/src/megameklab/ui/generalUnit/StatusBar.java
@@ -238,6 +238,14 @@ protected long estimatedHeatGeneration() {
 
         for (Mounted m : getEntity().getMisc()) {
             heat += m.getType().getHeat();
+
+            if (m.getType().hasFlag(MiscType.F_LASER_INSULATOR)) {
+                heat--;
+            } else if (m.getType().hasFlag(MiscType.F_PPC_CAPACITOR)) {
+                heat += 5;
+            } else if (m.getType().hasFlag(MiscType.F_RISC_LASER_PULSE_MODULE)) {
+                heat += 2;
+            }
         }
         return Math.round(heat);
     }