diff --git a/media/libstagefright/wifi-display/source/PlaybackSession.cpp b/media/libstagefright/wifi-display/source/PlaybackSession.cpp
index 5095c15..96c9222 100644
--- a/media/libstagefright/wifi-display/source/PlaybackSession.cpp
+++ b/media/libstagefright/wifi-display/source/PlaybackSession.cpp
@@ -229,8 +229,6 @@
     sp<ISurfaceComposer> service = interface_cast<ISurfaceComposer>(binder);
     CHECK(service != NULL);
 
-    service->connectDisplay(NULL);
-
     if (mSerializer != NULL) {
         mSerializer->stop();
 
@@ -243,6 +241,8 @@
         mSerializerLooper.clear();
     }
 
+    service->connectDisplay(NULL);
+
     if (mRTCPSessionID != 0) {
         mNetSession->destroySession(mRTCPSessionID);
     }