diff --git a/packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/server.py b/packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/server.py
index 4743324d..88db7487 100644
--- a/packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/server.py
+++ b/packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/server.py
@@ -273,23 +273,22 @@ def _negotiate_timeout(self, requested_timeout: Optional[str]) -> float:
 
     def _negotiate_options(self, options: dict) -> Tuple[dict, int, float]:
         negotiated = {}
-        blksize = 512  # RFC default
+        blksize = self.server.block_size
         timeout = self.server.timeout
 
         if 'blksize' in options:
             requested = options['blksize']
             blksize = self._negotiate_block_size(requested)
-            if blksize != int(requested):
-                negotiated['blksize'] = blksize
+            negotiated['blksize'] = blksize
 
         if 'timeout' in options:
             requested = options['timeout']
             timeout = self._negotiate_timeout(requested)
-            if timeout != int(requested):
-                negotiated['timeout'] = timeout
+            negotiated['timeout'] = int(timeout)
 
         return negotiated, blksize, timeout
 
+
     async def _start_transfer(self, filepath: pathlib.Path, addr: Tuple[str, int],
                              blksize: int, timeout: float, negotiated_options: dict):
         transfer = TftpReadTransfer(