diff --git a/core/jni/android_window_WindowInfosListener.cpp b/core/jni/android_window_WindowInfosListener.cpp
index f2cbe8abae8ba..32b85b01cdce6 100644
--- a/core/jni/android_window_WindowInfosListener.cpp
+++ b/core/jni/android_window_WindowInfosListener.cpp
@@ -118,6 +118,7 @@ struct WindowInfosListener : public gui::WindowInfosListener {
     }
 
     ~WindowInfosListener() override {
+        SurfaceComposerClient::getDefault()->removeWindowInfosListener(this);
         JNIEnv* env = AndroidRuntime::getJNIEnv();
         env->DeleteWeakGlobalRef(mListener);
     }