diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ConversationUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ConversationUtil.java
index 5af2866945..e8713c330a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ConversationUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ConversationUtil.java
@@ -142,7 +142,7 @@ public final class ConversationUtil {
   }
 
   public static int getMaxShortcuts(@NonNull Context context) {
-    return Math.min(ShortcutManagerCompat.getMaxShortcutCountPerActivity(context), 150);
+    return Math.min(ShortcutManagerCompat.getMaxShortcutCountPerActivity(context), 10);
   }
 
   /**