diff --git a/src/com/android/settings/widget/MediaAnimationController.java b/src/com/android/settings/widget/MediaAnimationController.java
index 87a53658031..1ef86c5289b 100644
--- a/src/com/android/settings/widget/MediaAnimationController.java
+++ b/src/com/android/settings/widget/MediaAnimationController.java
@@ -98,6 +98,7 @@ class MediaAnimationController implements VideoPreference.AnimationController {
             @Override
             public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) {
                 preview.setVisibility(View.VISIBLE);
+                mSurface = null;
                 return false;
             }