diff --git a/README.md b/README.md
index 99480ad5..879bbf03 100644
--- a/README.md
+++ b/README.md
@@ -192,6 +192,8 @@ Greylisted/blacklisted APIs or internal constants: (some constants are hardcoded
 <details>
 <summary>Hidden whitelisted APIs: (same catch as above, however, things in this list are less likely to be broken)</summary>
 
+* (since API 24, prior to API 31) `Landroid/bluetooth/BluetoothPan;-><init>(Landroid/content/Context;Landroid/bluetooth/BluetoothProfile$ServiceListener;)V,unsupported`
+* (since API 31) `Landroid/bluetooth/BluetoothPan;-><init>(Landroid/content/Context;Landroid/bluetooth/BluetoothProfile$ServiceListener;Landroid/bluetooth/BluetoothAdapter;)V,unsupported`
 * (since API 24) `Landroid/bluetooth/BluetoothPan;->isTetheringOn()Z,sdk,system-api,test-api`
 * (since API 24) `Landroid/bluetooth/BluetoothProfile;->PAN:I,sdk,system-api,test-api`
 * (since API 30) `Landroid/content/Context;->TETHERING_SERVICE:Ljava/lang/String;,sdk,system-api,test-api`
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/BluetoothTethering.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/BluetoothTethering.kt
index 5a52d2ab..e76c04dc 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/BluetoothTethering.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/BluetoothTethering.kt
@@ -27,14 +27,21 @@ class BluetoothTethering(context: Context, val stateListener: () -> Unit) :
         private const val PAN = 5
         private val clazz by lazy { Class.forName("android.bluetooth.BluetoothPan") }
         private val constructor by lazy {
-            clazz.getDeclaredConstructor(Context::class.java, BluetoothProfile.ServiceListener::class.java).apply {
+            (if (BuildCompat.isAtLeastS()) {
+                clazz.getDeclaredConstructor(Context::class.java, BluetoothProfile.ServiceListener::class.java,
+                    BluetoothAdapter::class.java)
+            } else {
+                clazz.getDeclaredConstructor(Context::class.java, BluetoothProfile.ServiceListener::class.java)
+            }).apply {
                 isAccessible = true
             }
         }
         private val isTetheringOn by lazy { clazz.getDeclaredMethod("isTetheringOn") }
 
-        fun pan(context: Context, serviceListener: BluetoothProfile.ServiceListener) =
-                constructor.newInstance(context, serviceListener) as BluetoothProfile
+        fun pan(context: Context, serviceListener: BluetoothProfile.ServiceListener, adapter: BluetoothAdapter) =
+            (if (BuildCompat.isAtLeastS()) {
+                constructor.newInstance(context, serviceListener, adapter)
+            } else constructor.newInstance(context, serviceListener)) as BluetoothProfile
         val BluetoothProfile.isTetheringOn get() = isTetheringOn(this) as Boolean
         fun BluetoothProfile.closePan() = BluetoothAdapter.getDefaultAdapter()!!.closeProfileProxy(PAN, this)
 
@@ -101,8 +108,8 @@ class BluetoothTethering(context: Context, val stateListener: () -> Unit) :
     private val receiver = broadcastReceiver { _, _ -> stateListener() }
 
     fun ensureInit(context: Context) {
-        if (pan == null && BluetoothAdapter.getDefaultAdapter() != null) try {
-            pan = pan(context, this)
+        if (pan == null) try {
+            pan = pan(context, this, BluetoothAdapter.getDefaultAdapter() ?: return)
         } catch (e: ReflectiveOperationException) {
             if (e.cause is SecurityException && BuildCompat.isAtLeastS()) Timber.d(e.readableMessage)
             else Timber.w(e)