diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScrollCaptureClient.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScrollCaptureClient.java
index 70be601c3e09a..54b99bbe74ccf 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScrollCaptureClient.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScrollCaptureClient.java
@@ -278,6 +278,7 @@ public class ScrollCaptureClient {
                 mStarted = true;
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed to start", e);
+                mReader.close();
             }
         }
 
@@ -327,6 +328,7 @@ public class ScrollCaptureClient {
             }
             if (mStarted) {
                 mShutdownListener = listener;
+                mReader.close();
                 try {
                     // listener called from onConnectionClosed callback
                     mConnection.endCapture();