diff --git a/dom/bluetooth/BluetoothHfpManager.cpp b/dom/bluetooth/BluetoothHfpManager.cpp
index 7d7c5ed6fa17..c46f87ade06d 100644
--- a/dom/bluetooth/BluetoothHfpManager.cpp
+++ b/dom/bluetooth/BluetoothHfpManager.cpp
@@ -686,6 +686,16 @@ BluetoothHfpManager::ReceiveSocketData(UnixSocketRawData* aMessage)
   } else if (msg.Find("ATD>") != -1) {
     // Currently, we don't support memory dialing in Dialer app
     SendLine("ERROR");
+    return;
+  } else if ((msg.Find("AT+XAPL=") != -1) ||
+             (msg.Find("AT+XEVENT=") != -1)) {
+    // FIXME: Bug 838089
+    // These are vendor commands used on some special headsets. Eventually we
+    // should reply with ERROR to all unknown incoming commands. However,
+    // in order not to cause interoperability issues for b2g18 branch, only
+    // filtering these two commands should be fine for now.
+    SendLine("ERROR");
+    return;
   } else if (msg.Find("ATD") != -1) {
     nsAutoCString message(msg), newMsg;
     int end = message.FindChar(';');