diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackPolicy.java b/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackPolicy.java
index e2a5baf89..d9706a4a3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackPolicy.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackPolicy.java
@@ -25,10 +25,10 @@ public final class GiphyMp4PlaybackPolicy {
   }
 
   public static int maxSimultaneousPlaybackInSearchResults() {
-    return 12;
+    return ApplicationDependencies.getExoPlayerPool().getPoolStats().getMaxUnreserved();
   }
 
   public static int maxSimultaneousPlaybackInConversation() {
-    return 4;
+    return ApplicationDependencies.getExoPlayerPool().getPoolStats().getMaxUnreserved() / 3;
   }
 }