diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index 41c12837e9..c4d3da2938 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -86,6 +86,12 @@ namespace Resource
         {
             if (animation)
             {
+                //"Default" is osg dae plugin's default naming scheme for unnamed animations
+                if (animation->getName() == "Default")
+                {
+                    animation->setName(std::string("idle"));
+                }
+
                 osg::ref_ptr<Resource::Animation> mergedAnimationTrack = new Resource::Animation;
                 const std::string animationName = animation->getName();
                 mergedAnimationTrack->setName(animationName);
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 1aeb6078a2..66012e05d4 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -437,10 +437,6 @@ namespace Resource
             {
                 if (animation)
                 {
-                    // "Default" is osg dae plugin's default naming scheme for unnamed animations
-                    if (animation->getName() == "Default")
-                        animation->setName(std::string("idle"));
-
                     auto& channels = animation->getChannels();
                     for (auto& channel : channels)
                     {