diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 453296eb..8833e9c6 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -6807,7 +6807,7 @@ MHD_set_connection_option (struct MHD_Connection *connection,
           XDLL_remove (daemon->manual_timeout_head,
                        daemon->manual_timeout_tail,
                        connection);
-        connection->connection_timeout_ms = ui_val * 1000;
+        connection->connection_timeout_ms = ((uint64_t) ui_val) * 1000;
         if (connection->connection_timeout_ms == daemon->connection_timeout_ms)
           XDLL_insert (daemon->normal_timeout_head,
                        daemon->normal_timeout_tail,
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index a09df69f..89dd535f 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -6308,7 +6308,7 @@ parse_options_va (struct MHD_Daemon *daemon,
         uv = UINT64_MAX / 4000 - 1;
       }
 #endif /* (SIZEOF_UINT64_T - 2) <= SIZEOF_UNSIGNED_INT */
-      daemon->connection_timeout_ms = uv * 1000;
+      daemon->connection_timeout_ms = ((uint64_t) uv) * 1000;
       break;
     case MHD_OPTION_NOTIFY_COMPLETED:
       daemon->notify_completed = va_arg (ap,