diff --git a/proguard-rules.pro b/proguard-rules.pro
index 0f28bdddfda58b7b2a11dc9aae169d85ab2d67c1..7a32b40861d608a1b1f6f5cc6c8d64a7cd0908c0 100644
--- a/proguard-rules.pro
+++ b/proguard-rules.pro
@@ -14,6 +14,10 @@
 -keep class org.openintents.openpgp.*
 -keep class org.webrtc.** { *; }
 
+-keep class com.google.gson.reflect.TypeToken
+-keep class * extends com.google.gson.reflect.TypeToken
+-keep public class * implements java.lang.reflect.Type
+
 -dontwarn javax.mail.internet.MimeMessage
 -dontwarn javax.mail.internet.MimeBodyPart
 -dontwarn javax.mail.internet.SharedInputStream
diff --git a/src/main/java/eu/siacs/conversations/entities/Reaction.java b/src/main/java/eu/siacs/conversations/entities/Reaction.java
index 2470305130dfa43fb87d1d79f124c25609dbcec1..c1ce186481754da43cdf4d8dcb13fd40870fe399 100644
--- a/src/main/java/eu/siacs/conversations/entities/Reaction.java
+++ b/src/main/java/eu/siacs/conversations/entities/Reaction.java
@@ -10,7 +10,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.Ordering;
-import com.google.common.reflect.TypeToken;
+import com.google.gson.reflect.TypeToken;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;