diff --git a/lib/http.c b/lib/http.c
index 2ea6f7ea5..9ce216ef4 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -3402,7 +3402,8 @@ CURLcode Curl_http_readwrite_headers(struct SessionHandle *data,
 
     }
     else if(checkprefix("Content-Encoding:", k->p) &&
-            data->set.str[STRING_ENCODING]) {
+            (data->set.str[STRING_ENCODING] ||
+             conn->httpversion == 20)) {
       /*
        * Process Content-Encoding. Look for the values: identity,
        * gzip, deflate, compress, x-gzip and x-compress. x-gzip and
diff --git a/lib/http2.c b/lib/http2.c
index baf36cc4c..a4baca9f1 100644
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -410,7 +410,6 @@ CURLcode Curl_http2_request_upgrade(Curl_send_buffer *req,
   free(base64);
 
   k->upgr101 = UPGR101_REQUESTED;
-  k->auto_decoding = GZIP;
 
   return result;
 }
@@ -641,7 +640,7 @@ int Curl_http2_switched(struct connectdata *conn)
   httpc->data = NULL;
   httpc->datalen = 0;
 
-  conn->data->req.auto_decoding = GZIP;
+  conn->httpversion = 20;
 
   /* Put place holder for status line */
   Curl_add_buffer(httpc->header_recvbuf, "HTTP/2.0 200\r\n", 14);