diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java
index d897a39ce08c4..582a62fea47a6 100644
--- a/core/java/android/widget/NumberPicker.java
+++ b/core/java/android/widget/NumberPicker.java
@@ -1096,12 +1096,7 @@ public class NumberPicker extends LinearLayout {
      * @see #setMaxValue(int)
      */
     public void setValue(int value) {
-        if (mValue == value) {
-            return;
-        }
         setValueInternal(value, false);
-        initializeSelectorWheelIndices();
-        invalidate();
     }
 
     /**
@@ -1498,6 +1493,8 @@ public class NumberPicker extends LinearLayout {
         if (notifyChange) {
             notifyChange(previous, current);
         }
+        initializeSelectorWheelIndices();
+        invalidate();
     }
 
     /**