diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java b/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java
index f9ed28cd1..b253f7f87 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java
@@ -40,7 +40,6 @@ import android.util.Log;
 import org.fdroid.fdroid.views.main.MainActivity;
 import org.fdroid.fdroid.views.main.NearbyViewBinder;
 
-import java.util.HashMap;
 
 /**
  * This is just a shim to receive {@link UsbManager#ACTION_USB_ACCESSORY_ATTACHED}
@@ -49,7 +48,6 @@ import java.util.HashMap;
 public class UsbDeviceAttachedReceiver extends BroadcastReceiver {
     public static final String TAG = "UsbDeviceAttachedReceiv";
 
-    private static final HashMap<Uri, ContentObserver> contentObservers = new HashMap<>();
 
     @RequiresApi(api = 19)
     @Override
@@ -77,6 +75,7 @@ public class UsbDeviceAttachedReceiver extends BroadcastReceiver {
                 }
             };
             contentResolver.registerContentObserver(uri, true, contentObserver);
+            UsbDeviceDetachedReceiver.contentObservers.put(uri, contentObserver);
         }
     }
 }
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceDetachedReceiver.java b/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceDetachedReceiver.java
index bb902b705..00b71da99 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceDetachedReceiver.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceDetachedReceiver.java
@@ -19,25 +19,17 @@
 
 package org.fdroid.fdroid.nearby;
 
-import android.app.Activity;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.UriPermission;
 import android.database.ContentObserver;
 import android.hardware.usb.UsbManager;
 import android.net.Uri;
 import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.util.Log;
-import org.fdroid.fdroid.views.main.MainActivity;
+import androidx.annotation.RequiresApi;
 import org.fdroid.fdroid.views.main.NearbyViewBinder;
 
 import java.util.HashMap;
@@ -49,7 +41,7 @@ import java.util.HashMap;
 public class UsbDeviceDetachedReceiver extends BroadcastReceiver {
     public static final String TAG = "UsbDeviceDetachedReceiv";
 
-    private static final HashMap<Uri, ContentObserver> contentObservers = new HashMap<>();
+    static final HashMap<Uri, ContentObserver> contentObservers = new HashMap<>();
 
     @RequiresApi(api = 19)
     @Override