diff --git a/lib/transfer.c b/lib/transfer.c
index d92b7edd41..3afefd4dfc 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -427,9 +427,8 @@ static CURLcode readwrite_data(struct Curl_easy *data,
   char *buf;
   size_t blen;
   size_t consumed;
-  int maxloops = 100;
-  curl_off_t max_recv = data->set.max_recv_speed?
-                        data->set.max_recv_speed : CURL_OFF_T_MAX;
+  int maxloops = 10;
+  curl_off_t max_recv = data->set.max_recv_speed ? 0 : CURL_OFF_T_MAX;
   bool data_eof_handled = FALSE;
 
   DEBUGASSERT(data->state.buffer);