diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java
index 7ba308a3f..86d8a987d 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java
@@ -66,7 +66,7 @@ public class BluetoothServer extends Thread {
     public void run() {
 
         isRunning = true;
-        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
 
         try {
             serverSocket = adapter.listenUsingInsecureRfcommWithServiceRecord("FDroid App Swap", BluetoothConstants.fdroidUuid());
@@ -83,6 +83,11 @@ public class BluetoothServer extends Thread {
                 break;
             }
 
+            if (!adapter.isEnabled()) {
+                Utils.debugLog(TAG, "User disabled Bluetooth from outside, stopping.");
+                break;
+            }
+
             try {
                 BluetoothSocket clientSocket = serverSocket.accept();
                 if (clientSocket != null) {