diff --git a/src/Core/Scripting/OOJSShip.m b/src/Core/Scripting/OOJSShip.m
index 8d5a6a4a5..560ab96bd 100644
--- a/src/Core/Scripting/OOJSShip.m
+++ b/src/Core/Scripting/OOJSShip.m
@@ -1864,7 +1864,15 @@ static JSBool ShipSetProperty(JSContext *context, JSObject *this, jsid propID, J
 					facing = [entity currentWeaponFacing];
 					break;
 			}
-			[entity setWeaponMount:facing toWeapon:sValue];
+			if ([entity isPlayer])
+			{
+				PlayerEntity *pent = (PlayerEntity*)entity;
+				[pent setWeaponMount:facing toWeapon:sValue inContext:@"scripted"];
+			}
+			else 
+			{
+				[entity setWeaponMount:facing toWeapon:sValue];
+			}
 			return YES;
 
 		case kShip_maxEscorts: