diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewDomains.java b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewDomains.java
index 2cdded273a..95eaaeb9ed 100644
--- a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewDomains.java
+++ b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewDomains.java
@@ -30,6 +30,7 @@ public class LinkPreviewDomains {
       "fbcdn.net",
       "redd.it",
       "imgur.com",
-      "pinimg.com"
+      "pinimg.com",
+      "giphy.com"
   ));
 }
diff --git a/src/org/thoughtcrime/securesms/net/ContentProxySelector.java b/src/org/thoughtcrime/securesms/net/ContentProxySelector.java
index 8ebd22bb16..7d08595d4e 100644
--- a/src/org/thoughtcrime/securesms/net/ContentProxySelector.java
+++ b/src/org/thoughtcrime/securesms/net/ContentProxySelector.java
@@ -29,7 +29,6 @@ public class ContentProxySelector extends ProxySelector {
   static {
     WHITELISTED_DOMAINS.addAll(LinkPreviewDomains.LINKS);
     WHITELISTED_DOMAINS.addAll(LinkPreviewDomains.IMAGES);
-    WHITELISTED_DOMAINS.add("giphy.com");
   }
 
   private final List<Proxy> CONTENT = new ArrayList<Proxy>(1) {{