diff --git a/Content.Server/Tools/Components/WelderComponent.cs b/Content.Server/Tools/Components/WelderComponent.cs
index f07e629127..27672a7adb 100644
--- a/Content.Server/Tools/Components/WelderComponent.cs
+++ b/Content.Server/Tools/Components/WelderComponent.cs
@@ -308,7 +308,7 @@ namespace Content.Server.Tools.Components
                     .TryGetDrainableSolution(eventArgs.Target.Uid, out var targetSolution)
                 && WelderSolution != null)
             {
-                if (WelderLit)
+                if (WelderLit && targetSolution.DrainAvailable > 0)
                 {
                     // Oh no no
                     eventArgs.Target.SpawnExplosion();
@@ -324,6 +324,11 @@ namespace Content.Server.Tools.Components
                     eventArgs.Target.PopupMessage(eventArgs.User,
                         Loc.GetString("welder-component-after-interact-refueled-message"));
                 }
+                else
+                {
+                    eventArgs.Target.PopupMessage(eventArgs.User,
+                        Loc.GetString("welder-component-no-fuel-in-tank", ("owner", eventArgs.Target)));
+                }
             }
 
             return true;
diff --git a/Resources/Locale/en-US/tools/components/welder-component.ftl b/Resources/Locale/en-US/tools/components/welder-component.ftl
index 53d01c1641..d27cae5318 100644
--- a/Resources/Locale/en-US/tools/components/welder-component.ftl
+++ b/Resources/Locale/en-US/tools/components/welder-component.ftl
@@ -1,6 +1,7 @@
 welder-component-welder-not-lit-message = The welder is turned off!
 welder-component-cannot-weld-message = The welder does not have enough fuel for that!
 welder-component-no-fuel-message = The welder has no fuel left!
+welder-component-no-fuel-in-tank = {$owner} is empty
 welder-component-on-examine-welder-lit-message = [color=orange]Lit[/color]
 welder-component-on-examine-welder-not-lit-message = Not lit
 welder-component-on-examine-detailed-message = Fuel: [color={$colorName}]{$fuelLeft}/{$fuelCapacity}[/color].
@@ -8,4 +9,4 @@ welder-component-suicide-lit-others-message = {$victim} welds their every orific
 welder-component-suicide-lit-message = You weld your every orifice closed!
 welder-component-suicide-unlit-others-message = {$victim} bashes themselves with the unlit welding torch!
 welder-component-suicide-unlit-message = You bash yourself with the unlit welding torch!
-welder-component-after-interact-refueled-message = Welder refueled
\ No newline at end of file
+welder-component-after-interact-refueled-message = Welder refueled
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
index 85caca8ce8..030df50418 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
@@ -17,6 +17,7 @@
   id: WeldingFuelTankFull
   parent: WeldingFuelTank
   name: fuel tank
+  suffix: Full
   description: A storage tank containing welding fuel.
   components:
   - type: Explosive