diff --git a/core/java/android/server/BluetoothDeviceService.java b/core/java/android/server/BluetoothDeviceService.java
index 8e5cee9bbfba9..3a89abd2f32d3 100644
--- a/core/java/android/server/BluetoothDeviceService.java
+++ b/core/java/android/server/BluetoothDeviceService.java
@@ -372,6 +372,10 @@ public class BluetoothDeviceService extends IBluetoothDevice.Stub {
                 mEventLoop.onModeChanged(getModeNative());
             }
 
+            if (mIsAirplaneSensitive && isAirplaneModeOn()) {
+                disable(false);
+            }
+
         }
     }