diff --git a/ares_timeout.c b/ares_timeout.c
index 2da4f5f4..738ad152 100644
--- a/ares_timeout.c
+++ b/ares_timeout.c
@@ -62,19 +62,20 @@ struct timeval *ares_timeout(ares_channel channel, struct timeval *maxtv,
         min_offset = offset;
     }
 
-  if(min_offset != -1) {
-    nextstop.tv_sec = min_offset/1000;
-    nextstop.tv_usec = (min_offset%1000)*1000;
-  }
-
   /* If we found a minimum timeout and it's sooner than the one specified in
    * maxtv (if any), return it.  Otherwise go with maxtv.
    */
-  if (min_offset != -1 && (!maxtv || ares__timedout(maxtv, &nextstop)))
+  if (min_offset != -1)
     {
-      *tvbuf = nextstop;
-      return tvbuf;
+      nextstop.tv_sec = min_offset/1000;
+      nextstop.tv_usec = (min_offset%1000)*1000;
+
+      if (!maxtv || ares__timedout(maxtv, &nextstop))
+        {
+          *tvbuf = nextstop;
+          return tvbuf;
+        }
     }
-  else
-    return maxtv;
+
+  return maxtv;
 }