diff --git a/core/java/android/widget/ToggleButton.java b/core/java/android/widget/ToggleButton.java
index ba9de24a27db8..a75426854e14e 100644
--- a/core/java/android/widget/ToggleButton.java
+++ b/core/java/android/widget/ToggleButton.java
@@ -138,6 +138,8 @@ public class ToggleButton extends CompoundButton {
             LayerDrawable layerDrawable = (LayerDrawable) backgroundDrawable;
             mIndicatorDrawable =
                     layerDrawable.findDrawableByLayerId(com.android.internal.R.id.toggle);
+        } else {
+            mIndicatorDrawable = null;
         }
     }