diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index 9cc40c95f..1d4636a08 100644
--- a/src/client/content_cao.cpp
+++ b/src/client/content_cao.cpp
@@ -1815,6 +1815,7 @@ void GenericCAO::processMessage(const std::string &data)
 			{
 					updateAnimation();
 			}
+			// FIXME: ^ This code is trash. It's also broken.
 		}
 	} else if (cmd == AO_CMD_SET_ANIMATION_SPEED) {
 		m_animation_speed = readF32(is);
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index 6aececa7f..f7c586b80 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -1404,6 +1404,8 @@ void Client::handleCommand_LocalPlayerAnimations(NetworkPacket* pkt)
 	*pkt >> player->local_animations[2];
 	*pkt >> player->local_animations[3];
 	*pkt >> player->local_animation_speed;
+
+	player->last_animation = -1;
 }
 
 void Client::handleCommand_EyeOffset(NetworkPacket* pkt)