diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 00c731662be..f07b7acc0f9 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -103,12 +103,24 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
     public void onStart() {
         super.onStart();
         addCachedDevices();
+        mSelectedDevice = null;
         if (mStartScanOnStart) {
             mLocalAdapter.startScanning(true);
             mStartScanOnStart = false;
         }
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        /* Check if any device was selected, if no device selected
+         * send  ACTION_DEVICE_SELECTED with a null device, otherwise
+         * don't do anything */
+        if (mSelectedDevice == null) {
+            sendDevicePickedIntent(null);
+        }
+    }
+
     @Override
     void onDevicePreferenceClick(BluetoothDevicePreference btPreference) {
         mLocalAdapter.stopScanning();