diff --git a/Content.Client/Extinguisher/FireExtinguisherComponent.cs b/Content.Client/Extinguisher/FireExtinguisherComponent.cs
new file mode 100644
index 0000000000..b73c7cd811
--- /dev/null
+++ b/Content.Client/Extinguisher/FireExtinguisherComponent.cs
@@ -0,0 +1,9 @@
+using Content.Shared.Extinguisher;
+using Robust.Shared.GameStates;
+
+namespace Content.Client.Extinguisher;
+
+[NetworkedComponent, RegisterComponent]
+public sealed class FireExtinguisherComponent : SharedFireExtinguisherComponent
+{
+}
diff --git a/Content.Server/Extinguisher/FireExtinguisherComponent.cs b/Content.Server/Extinguisher/FireExtinguisherComponent.cs
index ba64da5a62..e9bc5d00ce 100644
--- a/Content.Server/Extinguisher/FireExtinguisherComponent.cs
+++ b/Content.Server/Extinguisher/FireExtinguisherComponent.cs
@@ -1,17 +1,10 @@
-using Robust.Shared.Audio;
+using Content.Shared.Extinguisher;
+using Robust.Shared.GameStates;
 
 namespace Content.Server.Extinguisher;
 
-[RegisterComponent]
+[NetworkedComponent, RegisterComponent]
 [Access(typeof(FireExtinguisherSystem))]
-public sealed class FireExtinguisherComponent : Component
+public sealed class FireExtinguisherComponent : SharedFireExtinguisherComponent
 {
-    [DataField("refillSound")] public SoundSpecifier RefillSound = new SoundPathSpecifier("/Audio/Effects/refill.ogg");
-
-    [DataField("hasSafety")] public bool HasSafety = true;
-
-    [DataField("safety")] public bool Safety = true;
-
-    [DataField("safetySound")]
-    public SoundSpecifier SafetySound { get; } = new SoundPathSpecifier("/Audio/Machines/button.ogg");
 }
diff --git a/Content.Shared/Extinguisher/SharedFireExtinguisherComponent.cs b/Content.Shared/Extinguisher/SharedFireExtinguisherComponent.cs
index bfd4106b47..a5e4c7efb2 100644
--- a/Content.Shared/Extinguisher/SharedFireExtinguisherComponent.cs
+++ b/Content.Shared/Extinguisher/SharedFireExtinguisherComponent.cs
@@ -1,10 +1,23 @@
+using Robust.Shared.Audio;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Extinguisher
+namespace Content.Shared.Extinguisher;
+
+public abstract class SharedFireExtinguisherComponent : Component
 {
-    [Serializable, NetSerializable]
-    public enum FireExtinguisherVisuals : byte
-    {
-        Safety
-    }
+    [DataField("refillSound")] public SoundSpecifier RefillSound = new SoundPathSpecifier("/Audio/Effects/refill.ogg");
+
+    [DataField("hasSafety")] public bool HasSafety = true;
+
+    [DataField("safety")] public bool Safety = true;
+
+    [DataField("safetySound")]
+    public SoundSpecifier SafetySound { get; } = new SoundPathSpecifier("/Audio/Machines/button.ogg");
+}
+
+
+[Serializable, NetSerializable]
+public enum FireExtinguisherVisuals : byte
+{
+    Safety
 }