diff --git a/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt b/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
index 9b0ba64491..fc204a0c56 100644
--- a/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
+++ b/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
@@ -65,17 +65,19 @@ class ShortcutCreator @Inject constructor(
         } catch (failure: Throwable) {
             null
         }
+        val categories = if (Build.VERSION.SDK_INT >= 25) {
+            setOf(directShareCategory, ShortcutInfo.SHORTCUT_CATEGORY_CONVERSATION)
+        } else {
+            setOf(directShareCategory)
+        }
+
         return ShortcutInfoCompat.Builder(context, roomSummary.roomId)
                 .setShortLabel(roomSummary.displayName)
                 .setIcon(bitmap?.toProfileImageIcon())
                 .setIntent(intent)
                 .setLongLived(true)
                 .setRank(rank)
-
-                // Make it show up in the direct share menu
-                .setCategories(setOf(
-                        directShareCategory,
-                        ShortcutInfo.SHORTCUT_CATEGORY_CONVERSATION))
+                .setCategories(categories)
 
                 .build()
     }