diff --git a/core/src/mindustry/entities/comp/PayloadComp.java b/core/src/mindustry/entities/comp/PayloadComp.java
index 38b2dcd429..223716d9bd 100644
--- a/core/src/mindustry/entities/comp/PayloadComp.java
+++ b/core/src/mindustry/entities/comp/PayloadComp.java
@@ -131,7 +131,7 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
         }
 
         //drop off payload on an acceptor if possible
-        if(on != null && on.build != null && on.build.acceptPayload(on.build, payload)){
+        if(on != null && on.build != null && on.build.team == team && on.build.acceptPayload(on.build, payload)){
             Fx.unitDrop.at(on.build);
             on.build.handlePayload(on.build, payload);
             return true;
diff --git a/core/src/mindustry/world/blocks/power/ThermalGenerator.java b/core/src/mindustry/world/blocks/power/ThermalGenerator.java
index 9c71e77ca8..1af92ce5da 100644
--- a/core/src/mindustry/world/blocks/power/ThermalGenerator.java
+++ b/core/src/mindustry/world/blocks/power/ThermalGenerator.java
@@ -88,9 +88,15 @@ public class ThermalGenerator extends PowerGenerator{
             }
         }
 
+        @Override
+        public void afterPickedUp(){
+            super.afterPickedUp();
+            sum = 0f;
+        }
+
         @Override
         public float totalProgress(){
-            return enabled ? super.totalProgress() : 0f;
+            return enabled && sum > 0 ? super.totalProgress() : 0f;
         }
 
         @Override