diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
index 93e47f0cf..37f225d83 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
@@ -1019,7 +1019,8 @@ public class BTService extends XWService {
         synchronized( m_addrs ) {
             for ( BluetoothDevice dev : pairedDevs ) {
                 int clazz = dev.getBluetoothClass().getMajorDeviceClass();
-                if ( Major.PHONE == clazz || Major.COMPUTER == clazz ) {
+                if ( Major.PHONE == clazz
+                     || (XWApp.BT_SCAN_COMPUTERS && Major.COMPUTER == clazz) ) {
                     m_addrs.add( dev.getAddress() );
                 }
             }
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
index 126c5c9c2..5f649d510 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
@@ -46,6 +46,7 @@ public class XWApp extends Application {
     public static final boolean LOCUTILS_ENABLED = false;
     public static final boolean CONTEXT_MENUS_ENABLED = true;
     public static final boolean OFFER_DUALPANE = false;
+    public static final boolean BT_SCAN_COMPUTERS = false;
     
     public static final String SMS_PUBLIC_HEADER = "-XW4";
     public static final int MAX_TRAY_TILES = 7; // comtypes.h