diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
index a32a1d4ad..3d498defd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
@@ -923,10 +923,11 @@ public class GBDeviceAdapterv2 extends ListAdapter<GBDevice, GBDeviceAdapterv2.V
                     public void onClick(DialogInterface dialog, int which) {
                         try {
                             DeviceCoordinator coordinator = device.getDeviceCoordinator();
-                            if (coordinator != null) {
-                                coordinator.deleteDevice(device);
-                            }
+                            coordinator.deleteDevice(device);
                             DeviceHelper.getInstance().removeBond(device);
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                                removeDynamicShortcut(device);
+                            }
                         } catch (Exception ex) {
                             GB.toast(context, context.getString(R.string.error_deleting_device, ex.getMessage()), Toast.LENGTH_LONG, GB.ERROR, ex);
                         } finally {
@@ -1461,6 +1462,13 @@ public class GBDeviceAdapterv2 extends ListAdapter<GBDevice, GBDeviceAdapterv2.V
         );
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.R)
+    void removeDynamicShortcut(GBDevice device) {
+        final ShortcutManager shortcutManager = (ShortcutManager) context.getApplicationContext().getSystemService(Context.SHORTCUT_SERVICE);
+
+        shortcutManager.removeDynamicShortcuts(Collections.singletonList(device.getAddress()));
+    }
+
     private static class GBDeviceDiffUtil extends DiffUtil.ItemCallback<GBDevice> {
         @Override
         public boolean areItemsTheSame(@NonNull GBDevice oldItem, @NonNull GBDevice newItem) {