diff --git a/core/java/android/animation/ObjectAnimator.java b/core/java/android/animation/ObjectAnimator.java
index 7f11871b0f741..d038cd6d1a97f 100644
--- a/core/java/android/animation/ObjectAnimator.java
+++ b/core/java/android/animation/ObjectAnimator.java
@@ -340,8 +340,9 @@ public final class ObjectAnimator extends ValueAnimator {
     @Override
     public void setTarget(Object target) {
         if (mTarget != target) {
+            final Object oldTarget = mTarget;
             mTarget = target;
-            if (mTarget  != null && target != null && mTarget.getClass() == target.getClass()) {
+            if (oldTarget != null && target != null && oldTarget.getClass() == target.getClass()) {
                 return;
             }
             // New target type should cause re-initialization prior to starting