diff --git a/src/shared/drivers/canbus/CanProtocol/CanProtocol.cpp b/src/shared/drivers/canbus/CanProtocol/CanProtocol.cpp
index 2884c27a409eeaedea8aaaa2a1cfa1a69adb537e..8c87c97146dc95f96aca5e3ef88c1eaf04d7ee4e 100644
--- a/src/shared/drivers/canbus/CanProtocol/CanProtocol.cpp
+++ b/src/shared/drivers/canbus/CanProtocol/CanProtocol.cpp
@@ -136,8 +136,6 @@ void CanProtocol::sendMessage(const CanMessage& msg)
                  static_cast<uint32_t>(CanProtocolIdMask::LEFT_TO_SEND));
     packet.length = byteForUint64(msg.payload[0]);
 
-    packet.timestamp = Boardcore::TimestampTimer::getTimestamp();
-
     // Splits payload[0] in the right number of uint8_t
     for (int i = 0; i < packet.length; i++)
         packet.data[i] = msg.payload[0] >> (8 * i);
@@ -145,6 +143,7 @@ void CanProtocol::sendMessage(const CanMessage& msg)
     // Send the first packet
     can->send(packet);
     // Updates the loadEstimator
+    packet.timestamp = miosix::getTick();
     loadEstimator->addPacket(packet);
     leftToSend--;
 
@@ -164,6 +163,7 @@ void CanProtocol::sendMessage(const CanMessage& msg)
 
         can->send(packet);
         // Updates the loadEstimator
+        packet.timestamp = miosix::getTick();
         loadEstimator->addPacket(packet);
         leftToSend--;
     }
diff --git a/src/tests/drivers/canbus/CanProtocol/test-can-protocol-2way.cpp b/src/tests/drivers/canbus/CanProtocol/test-can-protocol-2way.cpp
index 37d4b9e86bc6ccafa42a727c71b02d34cd60df4c..ce45b5492b5ebc70dad94450508067b1d463de01 100644
--- a/src/tests/drivers/canbus/CanProtocol/test-can-protocol-2way.cpp
+++ b/src/tests/drivers/canbus/CanProtocol/test-can-protocol-2way.cpp
@@ -38,7 +38,7 @@
 #include <functional>
 #include <string>
 
-constexpr uint32_t BAUD_RATE         = 500 * 1000;
+constexpr uint32_t BAUD_RATE         = 250 * 1000;
 constexpr float SAMPLE_POINT         = 87.5f / 100.0f;
 constexpr uint32_t MSG_DEADLINE      = 100;  // ms
 constexpr uint32_t MSG_LOST_DEADLINE = 400;  // ms
@@ -212,7 +212,7 @@ int main()
     protocol->start();
 
     mc.start();
-    const int slp = 10;
+    const int slp = 5;
     for (;;)
     {
         sendNewRequest();