diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index c412c0d0a5..cbe5a4e44b 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -1509,7 +1509,6 @@ AfterSetCommand=%TextBannerAfterSet
 
 [TextBannerHighScores]
 Fallback="TextBanner"
-AfterSetCommand=%TextBannerHighScoreAfterSet
 
 
 [WheelNotifyIcon]
diff --git a/src/Actor.cpp b/src/Actor.cpp
index a778ae4f4f..1173ea82c8 100644
--- a/src/Actor.cpp
+++ b/src/Actor.cpp
@@ -1465,8 +1465,10 @@ void Actor::HandleMessage( const Message &msg )
 void Actor::PlayCommandNoRecurse( const Message &msg )
 {
 	const apActorCommands *pCmd = GetCommand( msg.GetName() );
-	if( pCmd != NULL )
+	if(pCmd != NULL && (*pCmd)->IsSet() && !(*pCmd)->IsNil())
+	{
 		RunCommands( *pCmd, &msg.GetParamTable() );
+	}
 }
 
 void Actor::PushContext( lua_State *L )