diff --git a/lib/multi.c b/lib/multi.c
index bd16f94..04ec169 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -1185,7 +1185,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
       result = Curl_is_connected(data->easy_conn, FIRSTSOCKET, &connected);
       if(connected && !result) {
         rc = CURLM_CALL_MULTI_PERFORM;
-        multistate(data, data->easy_conn->bits.tunnel_proxy?
+        multistate(data, (data->easy_conn->bits.tunnel_proxy && data->easy_conn->bits.httpproxy) ?
                    CURLM_STATE_WAITPROXYCONNECT:
                    CURLM_STATE_SENDPROTOCONNECT);
       }