diff --git a/data/libs/Player.lua b/data/libs/Player.lua
index 52a591bb47..ad5e8be0a4 100644
--- a/data/libs/Player.lua
+++ b/data/libs/Player.lua
@@ -431,7 +431,8 @@ local onGameEnd = function ()
 	-- clean up for next game:
 end
 
-local onEnterSystem = function ()
+local onEnterSystem = function (ship)
+	if not ship.IsPlayer() then return end
 	-- Return to game view when we exit hyperspace
 	if Engine.GetResetViewOnHyperspaceExit() and Game.CurrentView() ~= "world" then
 		Game.SetView("world")