diff --git a/mongoose.c b/mongoose.c
index b4798476..55a150da 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -4745,7 +4745,7 @@ static struct mg_connection *accept_conn(struct mg_connection *lsn,
     return NULL;
   }
   struct connstate *s = (struct connstate *) (c + 1);
-  s->dmss = 536;     // assume default, RFC-9293 3.7.1
+  s->dmss = 1460; // TODO(scaprile): 536;     // assume default, RFC-9293 3.7.1
   s->seq = mg_ntohl(pkt->tcp->ack), s->ack = mg_ntohl(pkt->tcp->seq);
   memcpy(s->mac, pkt->eth->src, sizeof(s->mac));
   settmout(c, MIP_TTYPE_KEEPALIVE);
diff --git a/src/net_builtin.c b/src/net_builtin.c
index c027e57e..d2b90299 100644
--- a/src/net_builtin.c
+++ b/src/net_builtin.c
@@ -580,7 +580,7 @@ static struct mg_connection *accept_conn(struct mg_connection *lsn,
     return NULL;
   }
   struct connstate *s = (struct connstate *) (c + 1);
-  s->dmss = 536;     // assume default, RFC-9293 3.7.1
+  s->dmss = 1460; // TODO(scaprile): 536;     // assume default, RFC-9293 3.7.1
   s->seq = mg_ntohl(pkt->tcp->ack), s->ack = mg_ntohl(pkt->tcp->seq);
   memcpy(s->mac, pkt->eth->src, sizeof(s->mac));
   settmout(c, MIP_TTYPE_KEEPALIVE);