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 3419cd0ee..e74efe180 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ConversationUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ConversationUtil.java
@@ -135,7 +135,7 @@ public final class ConversationUtil {
   @RequiresApi(CONVERSATION_SUPPORT_VERSION)
   public static int getMaxShortcuts(@NonNull Context context) {
     ShortcutManager shortcutManager  = ServiceUtil.getShortcutManager(context);
-    return shortcutManager.getMaxShortcutCountPerActivity();
+    return Math.min(shortcutManager.getMaxShortcutCountPerActivity(), 150);
   }
 
   /**