diff --git a/OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs b/OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs
index 4877d27112..4f7928f50d 100644
--- a/OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs
+++ b/OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs
@@ -72,11 +72,15 @@ namespace OpenRA.Mods.Common.Traits
 			int amount;
 			if (!powerDrain.TryGetValue(a, out amount))
 				return;
+			powerDrain.Remove(a);
+
+			if (devMode.UnlimitedPower)
+				return;
+
 			if (amount > 0)
 				totalProvided -= amount;
 			else if (amount < 0)
 				totalDrained += amount;
-			powerDrain.Remove(a);
 		}
 
 		int nextPowerAdviceTime = 0;