diff --git a/changelog/3810.md b/changelog/3810.md
index 81a4a17d7c..693a2e08d3 100644
--- a/changelog/3810.md
+++ b/changelog/3810.md
@@ -100,7 +100,7 @@
 
 - (#5668, #6066) Rework Seraphim weapon modules
   
-- (#6065) Refactor collision beam modules
+- (#6065, #6116) Refactor collision beam modules
 
 - (#6067) Fix a performance issue related to AIs and their transport logic
 
diff --git a/lua/sim/collisionBeams/OrbitalDeathLaserCollisionBeam.lua b/lua/sim/collisionBeams/OrbitalDeathLaserCollisionBeam.lua
index 344dce2117..9a5d8cd548 100644
--- a/lua/sim/collisionBeams/OrbitalDeathLaserCollisionBeam.lua
+++ b/lua/sim/collisionBeams/OrbitalDeathLaserCollisionBeam.lua
@@ -10,9 +10,9 @@ OrbitalDeathLaserCollisionBeam = Class(SCCollisionBeam) {
     TerrainImpactType = 'LargeBeam02',
     TerrainImpactScale = 1,
 
+    FxBeamStartPoint = EffectTemplate.TOrbitalDeathLaserMuzzleFlash01,
     FxBeam = EffectTemplate.TOrbitalDeathLaserBeam,
-    FxBeamEndPoint = EffectTemplate.TOrbitalDeathLaserMuzzleFlash01,
-    FxBeamStartPoint = EffectTemplate.TOrbitalDeathLaserHit01,
+    FxBeamEndPoint = EffectTemplate.TOrbitalDeathLaserHit01,
 
     SplatTexture = 'czar_mark01_albedo',
     ScorchSplatDropTime = 0.5,
diff --git a/lua/sim/collisionBeams/QuantumBeamGeneratorCollisionBeam.lua b/lua/sim/collisionBeams/QuantumBeamGeneratorCollisionBeam.lua
index a49fddb1ff..474f108f10 100644
--- a/lua/sim/collisionBeams/QuantumBeamGeneratorCollisionBeam.lua
+++ b/lua/sim/collisionBeams/QuantumBeamGeneratorCollisionBeam.lua
@@ -10,9 +10,9 @@ QuantumBeamGeneratorCollisionBeam = Class(SCCollisionBeam) {
     TerrainImpactType = 'LargeBeam02',
     TerrainImpactScale = 1,
 
+    FxBeamStartPoint = EffectTemplate.AQuantumBeamGeneratorMuzzleFlash01,
     FxBeam =  EffectTemplate.AQuantumBeamGeneratorBeam,
-    FxBeamEndPoint = EffectTemplate.AQuantumBeamGeneratorMuzzleFlash01,
-    FxBeamStartPoint = EffectTemplate.AQuantumBeamGeneratorHit01,
+    FxBeamEndPoint = EffectTemplate.AQuantumBeamGeneratorHit01,
 
     SplatTexture = 'czar_mark01_albedo',
     ScorchSplatDropTime = 0.5,