diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp
index 7931c3538c..ae28356b12 100644
--- a/stepmania/src/Actor.cpp
+++ b/stepmania/src/Actor.cpp
@@ -745,7 +745,8 @@ void Actor::StopTweening()
 
 void Actor::FinishTweening()
 {
-	m_current = DestTweenState();
+	if( !m_Tweens.empty() )
+		m_current = DestTweenState();
 	StopTweening();
 }