diff --git a/lib/transfer.c b/lib/transfer.c
index 4ce6f32aa..1f2c6886f 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -960,6 +960,10 @@ CURLcode Curl_perform(CURL *curl)
     conn->newurl = NULL;
   }
 
+  /* make sure the alarm is switched off! */
+  if(data->timeout || data->connecttimeout)
+    myalarm(0);
+
   return res;
 }