diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 99349b0473eac..7db8a1e6c99c6 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -3472,6 +3472,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
         if (mText.length() == 0) {
             invalidate();
         }
+
+        // Invalidate display list if hint will be used
+        if (mText.length() == 0 && mHint != null) mTextDisplayListIsValid = false;
     }
 
     /**