diff --git a/engine/src/flutter/shell/android/org/domokit/sky/shell/SkyActivity.java b/engine/src/flutter/shell/android/org/domokit/sky/shell/SkyActivity.java
index 101c282665a..47480222d63 100644
--- a/engine/src/flutter/shell/android/org/domokit/sky/shell/SkyActivity.java
+++ b/engine/src/flutter/shell/android/org/domokit/sky/shell/SkyActivity.java
@@ -38,6 +38,16 @@ public class SkyActivity extends Activity {
         mTracingController = new TracingController(this);
     }
 
+    /**
+     * @see android.app.Activity#onStop()
+     */
+    @Override
+    protected void onStop() {
+        // Do we need to shut down Sky too?
+        mTracingController.stop();
+        super.onStop();
+    }
+
     public void loadUrl(String url) {
         mView.loadUrl(url);
     }
diff --git a/engine/src/flutter/shell/android/org/domokit/sky/shell/TracingController.java b/engine/src/flutter/shell/android/org/domokit/sky/shell/TracingController.java
index 716e0c007d8..b373747f6dc 100644
--- a/engine/src/flutter/shell/android/org/domokit/sky/shell/TracingController.java
+++ b/engine/src/flutter/shell/android/org/domokit/sky/shell/TracingController.java
@@ -8,17 +8,16 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.os.Environment;
 import android.util.Log;
 
+import org.chromium.base.JNINamespace;
+
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import org.chromium.base.JNINamespace;
-
 /**
  * A controller for the tracing system.
  */
@@ -40,6 +39,10 @@ class TracingController {
         mContext.registerReceiver(mBroadcastReceiver, mIntentFilter);
     }
 
+    public void stop() {
+        mContext.unregisterReceiver(mBroadcastReceiver);
+    }
+
     private String generateTracingFilePath() {
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd-HHmmss", Locale.US);
         formatter.setTimeZone(TimeZone.getTimeZone("UTC"));