diff --git a/src/rendering/m2_renderer.cpp b/src/rendering/m2_renderer.cpp
index b079f50a..2c25cd77 100644
--- a/src/rendering/m2_renderer.cpp
+++ b/src/rendering/m2_renderer.cpp
@@ -1148,7 +1148,8 @@ bool M2Renderer::loadModel(const pipeline::M2Model& model, uint32_t modelId) {
         (lowerName.find("lavasplash") != std::string::npos) ||
         (lowerName.find("lavabubble") != std::string::npos) ||
         (lowerName.find("lavasteam") != std::string::npos) ||
-        (lowerName.find("wisps") != std::string::npos);
+        (lowerName.find("wisps") != std::string::npos) ||
+        (lowerName.find("levelup") != std::string::npos);
     gpuModel.isSpellEffect = effectByName ||
                               (hasParticles && model.vertices.size() <= 200 &&
                                model.particleEmitters.size() >= 3);
diff --git a/src/rendering/renderer.cpp b/src/rendering/renderer.cpp
index 71cb2a7c..56ce7c07 100644
--- a/src/rendering/renderer.cpp
+++ b/src/rendering/renderer.cpp
@@ -710,6 +710,8 @@ bool Renderer::initialize(core::Window* win) {
 
     levelUpEffect = std::make_unique<LevelUpEffect>();
 
+    questMarkerRenderer = std::make_unique<QuestMarkerRenderer>();
+
     LOG_INFO("Vulkan sub-renderers initialized (Phase 3)");
 
     // LightingManager doesn't use GL — initialize for data-only use
@@ -2222,6 +2224,14 @@ void Renderer::updateCharacterAnimation() {
             } else if (sitting) {
                 cancelEmote();
                 newState = CharAnimState::SIT_DOWN;
+            } else if (!emoteLoop && characterRenderer && characterInstanceId > 0) {
+                // Auto-cancel non-looping emotes once animation completes
+                uint32_t curId = 0; float curT = 0.0f, curDur = 0.0f;
+                if (characterRenderer->getAnimationState(characterInstanceId, curId, curT, curDur)
+                        && curDur > 0.1f && curT >= curDur - 0.05f) {
+                    cancelEmote();
+                    newState = CharAnimState::IDLE;
+                }
             }
             break;