diff --git a/OpenRA.Mods.RA/Activities/Teleport.cs b/OpenRA.Mods.RA/Activities/Teleport.cs
index 5483e7c9be..ede8cbed78 100755
--- a/OpenRA.Mods.RA/Activities/Teleport.cs
+++ b/OpenRA.Mods.RA/Activities/Teleport.cs
@@ -10,6 +10,7 @@
 
 using System.Linq;
 using OpenRA.Traits;
+using OpenRA.Mods.RA.Render;
 
 namespace OpenRA.Mods.RA.Activities
 {
@@ -28,6 +29,9 @@ namespace OpenRA.Mods.RA.Activities
 
 		public override Activity Tick(Actor self)
 		{
+			Sound.Play("chrono2.aud", self.Location.ToPPos());
+			Sound.Play("chrono2.aud", destination.ToPPos());
+
 			self.Trait<ITeleportable>().SetPosition(self, destination);
 
 			if (killCargo && self.HasTrait<Cargo>())
@@ -42,6 +46,13 @@ namespace OpenRA.Mods.RA.Activities
 				}
 			}
 
+			// Trigger screen desaturate effect
+			foreach (var a in self.World.ActorsWithTrait<ChronoshiftPaletteEffect>())
+				a.Trait.Enable();
+
+			if (chronosphere != null && !chronosphere.Destroyed && chronosphere.HasTrait<RenderBuilding>())
+				chronosphere.Trait<RenderBuilding>().PlayCustomAnim(chronosphere, "active");
+
 			return NextActivity;
 		}
 	}
diff --git a/OpenRA.Mods.RA/ChronoshiftDeploy.cs b/OpenRA.Mods.RA/ChronoshiftDeploy.cs
index b61288984d..a6837e000b 100644
--- a/OpenRA.Mods.RA/ChronoshiftDeploy.cs
+++ b/OpenRA.Mods.RA/ChronoshiftDeploy.cs
@@ -56,12 +56,7 @@ namespace OpenRA.Mods.RA
 
 				self.CancelActivity();
 				self.QueueActivity(new Teleport(null, order.TargetLocation, true));
-				Sound.Play("chrotnk1.aud", self.CenterLocation);
-				Sound.Play("chrotnk1.aud", order.TargetLocation.ToPPos());
 				chargeTick = 25 * self.Info.Traits.Get<ChronoshiftDeployInfo>().ChargeTime;
-
-				foreach (var a in self.World.ActorsWithTrait<ChronoshiftPaletteEffect>())
-					a.Trait.Enable();
 			}
 		}
 
diff --git a/OpenRA.Mods.RA/Scripting/RASpecialPowers.cs b/OpenRA.Mods.RA/Scripting/RASpecialPowers.cs
index 0cb8c4d09a..47ddcf1818 100644
--- a/OpenRA.Mods.RA/Scripting/RASpecialPowers.cs
+++ b/OpenRA.Mods.RA/Scripting/RASpecialPowers.cs
@@ -20,15 +20,6 @@ namespace OpenRA.Scripting
 	{
 		public static void Chronoshift(World world, List<Pair<Actor, CPos>> units, Actor chronosphere, int duration, bool killCargo)
 		{
-			if (chronosphere != null)
-				chronosphere.Trait<RenderBuilding>().PlayCustomAnim(chronosphere, "active");
-
-			// Trigger screen desaturate effect
-			foreach (var a in world.ActorsWithTrait<ChronoshiftPaletteEffect>())
-				a.Trait.Enable();
-
-			Sound.Play("chrono2.aud", units.First().First.CenterLocation);
-
 			foreach (var kv in units)
 			{
 				var target = kv.First;
@@ -37,8 +28,6 @@ namespace OpenRA.Scripting
 				if (cs.CanChronoshiftTo(target, targetCell, true))
 					cs.Teleport(target, targetCell, duration, killCargo,chronosphere);
 			}
-
-
 		}
 	}
 }
diff --git a/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs b/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs
index e3b85e08c8..38b0486994 100755
--- a/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs
+++ b/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs
@@ -39,14 +39,6 @@ namespace OpenRA.Mods.RA
 
 		public override void Activate(Actor self, Order order)
 		{
-			self.Trait<RenderBuilding>().PlayCustomAnim(self, "active");
-
-			// Trigger screen desaturate effect
-			foreach (var a in self.World.ActorsWithTrait<ChronoshiftPaletteEffect>())
-				a.Trait.Enable();
-
-			Sound.Play("chrono2.aud", order.TargetLocation.ToPPos());
-			Sound.Play("chrono2.aud", order.ExtraLocation.ToPPos());
 			foreach (var target in UnitsInRange(order.ExtraLocation))
 			{
 				var cs = target.Trait<Chronoshiftable>();