diff --git a/src/gameobjects/components/Animation.js b/src/gameobjects/components/Animation.js
index 5c58515d1..a21a1b752 100644
--- a/src/gameobjects/components/Animation.js
+++ b/src/gameobjects/components/Animation.js
@@ -1020,13 +1020,16 @@ var Animation = new Class({
 
         gameObject.setSizeToFrame();
 
-        if (animationFrame.frame.customPivot)
+        if (gameObject._originComponent)
         {
-            gameObject.setOrigin(animationFrame.frame.pivotX, animationFrame.frame.pivotY);
-        }
-        else
-        {
-            gameObject.updateDisplayOrigin();
+            if (animationFrame.frame.customPivot)
+            {
+                gameObject.setOrigin(animationFrame.frame.pivotX, animationFrame.frame.pivotY);
+            }
+            else
+            {
+                gameObject.updateDisplayOrigin();
+            }
         }
 
         return gameObject;