diff --git a/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs b/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs
index f9d6b14740..2b330ae897 100644
--- a/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs
+++ b/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs
@@ -1,13 +1,9 @@
-using System.Linq;
-using Content.Shared._White.Chemistry;
-using Content.Shared._White.WeaponModules;
+using Content.Shared._White.WeaponModules;
 using Content.Shared.Weapons.Ranged.Components;
-using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Weapons.Ranged.Systems;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
-using Robust.Shared.Prototypes;
 
 namespace Content.Server._White.WeaponModules;
 
diff --git a/Content.Server/_White/WeaponModules/Components/AcceleratorModuleComponent.cs b/Content.Shared/_White/WeaponModules/AcceleratorModuleComponent.cs
similarity index 100%
rename from Content.Server/_White/WeaponModules/Components/AcceleratorModuleComponent.cs
rename to Content.Shared/_White/WeaponModules/AcceleratorModuleComponent.cs
diff --git a/Content.Server/_White/WeaponModules/Components/FlameHiderModuleComponent.cs b/Content.Shared/_White/WeaponModules/FlameHiderModuleComponent.cs
similarity index 100%
rename from Content.Server/_White/WeaponModules/Components/FlameHiderModuleComponent.cs
rename to Content.Shared/_White/WeaponModules/FlameHiderModuleComponent.cs
diff --git a/Content.Server/_White/WeaponModules/Components/LaserModuleComponent.cs b/Content.Shared/_White/WeaponModules/LaserModuleComponent.cs
similarity index 100%
rename from Content.Server/_White/WeaponModules/Components/LaserModuleComponent.cs
rename to Content.Shared/_White/WeaponModules/LaserModuleComponent.cs
diff --git a/Content.Server/_White/WeaponModules/Components/LightModuleComponent.cs b/Content.Shared/_White/WeaponModules/LightModuleComponent.cs
similarity index 100%
rename from Content.Server/_White/WeaponModules/Components/LightModuleComponent.cs
rename to Content.Shared/_White/WeaponModules/LightModuleComponent.cs
diff --git a/Content.Shared/_White/WeaponModules/SharedWeaponModulesSystem.cs b/Content.Shared/_White/WeaponModules/SharedWeaponModulesSystem.cs
index 50fb307916..2de85a0420 100644
--- a/Content.Shared/_White/WeaponModules/SharedWeaponModulesSystem.cs
+++ b/Content.Shared/_White/WeaponModules/SharedWeaponModulesSystem.cs
@@ -4,7 +4,6 @@ namespace Content.Shared._White.WeaponModules;
 
 public abstract class SharedWeaponModulesSystem : EntitySystem
 {
-
     public override void Initialize()
     {
         SubscribeLocalEvent<WeaponModulesComponent, GunMuzzleFlashAttemptEvent>(OnMuzzleFlashEvent);
diff --git a/Content.Server/_White/WeaponModules/Components/SilencerModuleComponent.cs b/Content.Shared/_White/WeaponModules/SilencerModuleComponent.cs
similarity index 100%
rename from Content.Server/_White/WeaponModules/Components/SilencerModuleComponent.cs
rename to Content.Shared/_White/WeaponModules/SilencerModuleComponent.cs
diff --git a/Content.Shared/_White/WeaponModules/WeaponModulesComponent.cs b/Content.Shared/_White/WeaponModules/WeaponModulesComponent.cs
index 1a9c9bcf85..d40d342e78 100644
--- a/Content.Shared/_White/WeaponModules/WeaponModulesComponent.cs
+++ b/Content.Shared/_White/WeaponModules/WeaponModulesComponent.cs
@@ -6,13 +6,13 @@ namespace Content.Shared._White.WeaponModules;
 /// <summary>
 /// Base Module Component
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent]
 public partial class WeaponModulesComponent : Component
 {
     [ViewVariables(VVAccess.ReadWrite), DataField]
     public List<EntityUid> Modules = new();
 
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public bool UseEffect;
 }