diff --git a/src/primaite/simulator/system/services/ntp/ntp_client.py b/src/primaite/simulator/system/services/ntp/ntp_client.py
index 38ef820b..2b2c725a 100644
--- a/src/primaite/simulator/system/services/ntp/ntp_client.py
+++ b/src/primaite/simulator/system/services/ntp/ntp_client.py
@@ -100,9 +100,9 @@ class NTPClient(Service):
             self.time = payload.ntp_reply.ntp_datetime
             return True
 
-    def request_time(self) -> None:
+    def request_time(self, ip_address: IPv4Address = ip_addr) -> None:
         """Send request to ntp_server."""
-        ntp_request = NTPRequest(ntp_client=self.ip_addr)
+        ntp_request = NTPRequest(ntp_client=ip_address)
         ntp_server_packet = NTPPacket(ntp_request=ntp_request)
         self.send(payload=ntp_server_packet)
 
diff --git a/src/primaite/simulator/system/services/ntp/ntp_server.py b/src/primaite/simulator/system/services/ntp/ntp_server.py
index 13bc04ee..6d76c1ed 100644
--- a/src/primaite/simulator/system/services/ntp/ntp_server.py
+++ b/src/primaite/simulator/system/services/ntp/ntp_server.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, Dict, Optional
+from typing import Dict, Optional
 
 from primaite import getLogger
 from primaite.simulator.network.protocols.ntp import NTPPacket
@@ -46,7 +46,7 @@ class NTPServer(Service):
 
     def receive(
         self,
-        payload: Any,
+        payload: NTPPacket,
         session_id: Optional[str] = None,
         **kwargs,
     ) -> bool:
diff --git a/tests/integration_tests/system/test_ntp_client_server.py b/tests/integration_tests/system/test_ntp_client_server.py
index 95394e84..54e54a5b 100644
--- a/tests/integration_tests/system/test_ntp_client_server.py
+++ b/tests/integration_tests/system/test_ntp_client_server.py
@@ -58,7 +58,9 @@ def test_ntp_client_server():
 
     ntp_request = NTPRequest(ntp_client="192.168.1.3")
     ntp_packet = NTPPacket(ntp_request=ntp_request)
-    ntp_client.send(payload=ntp_packet)
+    # ntp_client.send(payload=ntp_packet)
+    ntp_client.request_time("192.168.1.3")
+
     assert ntp_server.receive(payload=ntp_packet) is True
     assert ntp_client.receive(payload=ntp_packet) is True
     assert ntp_client.time is not None