diff --git a/src/java/com/zimbra/oauth/utilities/OAuth2ProxyUtilities.java b/src/java/com/zimbra/oauth/utilities/OAuth2ProxyUtilities.java
index 14e3e63..df30e88 100644
--- a/src/java/com/zimbra/oauth/utilities/OAuth2ProxyUtilities.java
+++ b/src/java/com/zimbra/oauth/utilities/OAuth2ProxyUtilities.java
@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.Set;
 
@@ -48,6 +49,7 @@
 import org.apache.http.impl.client.HttpClientBuilder;
 
 import com.zimbra.common.httpclient.HttpClientUtil;
+import com.zimbra.common.localconfig.LC;
 import com.zimbra.common.service.ServiceException;
 import com.zimbra.common.util.ByteUtil;
 import com.zimbra.common.util.ZimbraHttpConnectionManager;
@@ -132,7 +134,8 @@ protected static boolean canProxyHeader(String header) {
             || header.equals("cache-control")
             || header.equals("cookie")
             || header.equals("origin")
-            || header.equals("transfer-encoding"));
+            || header.equals("transfer-encoding")
+            || Arrays.asList(LC.proxy_servlet_drop_headers.value().toString().split(",")).contains(header));
     }
 
     protected static void sendError(HttpServletResponse resp, int statusCode, String code) throws IOException {