diff --git a/src/Frame.cpp b/src/Frame.cpp
index 5ca286a6f..0807eeafa 100644
--- a/src/Frame.cpp
+++ b/src/Frame.cpp
@@ -246,7 +246,6 @@ void Frame::DeleteFrames()
 
 Frame *Frame::GetFrame(FrameId fId)
 {
-	PROFILE_SCOPED()
 #ifndef NDEBUG
 	if (fId && fId >= s_frames.size())
 		Error("In '%s': fId is valid but out of range (%zu)...\n", __func__, fId.id());
diff --git a/src/Ship.cpp b/src/Ship.cpp
index 5134a346a..e9ba2544d 100644
--- a/src/Ship.cpp
+++ b/src/Ship.cpp
@@ -65,6 +65,7 @@ Ship::Ship(const ShipType::Id &shipId) :
 	m_launchLockTimeout = 0;
 	m_wheelTransition = 0;
 	m_wheelState = 0;
+	m_forceWheelUpdate = false;
 	m_dockedWith = nullptr;
 	m_dockedWithPort = 0;
 	SetShipId(shipId);
@@ -129,6 +130,7 @@ Ship::Ship(const Json &jsonObj, Space *space) :
 		// needs fixups
 		m_wheelTransition = shipObj["wheel_transition"];
 		m_wheelState = shipObj["wheel_state"];
+		m_forceWheelUpdate = true;
 		m_launchLockTimeout = shipObj["launch_lock_timeout"];
 		m_testLanded = shipObj["test_landed"];
 		m_flightState = shipObj["flight_state"];
@@ -229,10 +231,7 @@ void Ship::Init()
 	m_hyperspaceCloud = 0;
 
 	m_landingGearAnimation = GetModel()->FindAnimation("gear_down");
-	// TODO: this causes the landing gear animation to be ticked for all ships regardless of whether it actually needs to be.
-	// Need smarter control regarding landing gear transitions.
-	if (m_landingGearAnimation)
-		GetModel()->SetAnimationActive(GetModel()->FindAnimationIndex(m_landingGearAnimation), true);
+	m_forceWheelUpdate = true;
 
 	GetFixedGuns()->InitGuns(GetModel());
 
@@ -964,6 +963,7 @@ void Ship::SetLandedOn(Planet *p, float latitude, float longitude)
 {
 	m_wheelTransition = 0;
 	m_wheelState = 1.0f;
+	m_forceWheelUpdate = true;
 	Frame *f_non_rot = Frame::GetFrame(p->GetFrame());
 	SetFrame(f_non_rot->GetRotFrame());
 
@@ -999,8 +999,14 @@ void Ship::TimeStepUpdate(const float timeStep)
 	//apply extra atmospheric flight forces
 	AddTorque(CalcAtmoTorque());
 
-	if (m_landingGearAnimation)
+	if (m_landingGearAnimation) {
 		m_landingGearAnimation->SetProgress(m_wheelState);
+		if (m_forceWheelUpdate) {
+			m_landingGearAnimation->Interpolate();
+			m_forceWheelUpdate = false;
+		}
+	}
+
 	m_dragCoeff = DynamicBody::DEFAULT_DRAG_COEFF * (1.0 + 0.25 * m_wheelState);
 	DynamicBody::TimeStepUpdate(timeStep);
 
@@ -1366,8 +1372,13 @@ void Ship::StaticUpdate(const float timeStep)
 	if (m_wheelTransition) {
 		m_wheelState += m_wheelTransition * 0.3f * timeStep;
 		m_wheelState = Clamp(m_wheelState, 0.0f, 1.0f);
-		if (is_equal_exact(m_wheelState, 0.0f) || is_equal_exact(m_wheelState, 1.0f))
+		if (is_equal_exact(m_wheelState, 0.0f) || is_equal_exact(m_wheelState, 1.0f)) {
 			m_wheelTransition = 0;
+			// TODO: this really needs to be driven by the animation; work around it by forcing an update for the last frame of the animation
+			m_forceWheelUpdate = true;
+			if (m_landingGearAnimation)
+				GetModel()->SetAnimationActive(GetModel()->FindAnimationIndex(m_landingGearAnimation), false);
+		}
 	}
 
 	if (m_testLanded) TestLanded();
@@ -1437,6 +1448,7 @@ void Ship::SetDockedWith(SpaceStation *s, int port)
 		m_dockedWithPort = port;
 		m_wheelTransition = 0;
 		m_wheelState = 1.0f;
+		m_forceWheelUpdate = true;
 		// hand position/state responsibility over to station
 		m_dockedWith->SetDocked(this, port);
 		onDock.emit();
@@ -1460,6 +1472,8 @@ bool Ship::SetWheelState(bool down)
 	int newWheelTransition = (down ? 1 : -1);
 	if (newWheelTransition == m_wheelTransition) return false;
 	m_wheelTransition = newWheelTransition;
+	if (m_landingGearAnimation)
+		GetModel()->SetAnimationActive(GetModel()->FindAnimationIndex(m_landingGearAnimation), true);
 	return true;
 }
 
diff --git a/src/Ship.h b/src/Ship.h
index 8dba97654..0066d875e 100644
--- a/src/Ship.h
+++ b/src/Ship.h
@@ -297,6 +297,7 @@ private:
 
 	FlightState m_flightState;
 	bool m_testLanded;
+	bool m_forceWheelUpdate;
 	float m_launchLockTimeout;
 	float m_wheelState;
 	int m_wheelTransition;
diff --git a/src/scenegraph/Model.cpp b/src/scenegraph/Model.cpp
index 732a35d98..90e2aaad6 100644
--- a/src/scenegraph/Model.cpp
+++ b/src/scenegraph/Model.cpp
@@ -568,7 +568,7 @@ namespace SceneGraph {
 			activeArray.push_back(GetAnimationActive(i));
 		}
 		modelObj["animations"] = animationArray; // Add animation array to model object.
-		modelObj["activeAnimations"] = animationArray;
+		modelObj["activeAnimations"] = activeArray;
 
 		modelObj["cur_pattern_index"] = m_curPatternIndex;