diff --git a/Core/Src/canlog.c b/Core/Src/canlog.c
index e821c99..930a3ba 100644
--- a/Core/Src/canlog.c
+++ b/Core/Src/canlog.c
@@ -83,7 +83,8 @@ void HAL_CAN_RxFifo0MsgPendingCallback(CAN_HandleTypeDef *hcan)
     // TODO: manage the case of FIFO overflow
     if (HAL_CAN_GetRxMessage(hcan, CAN_RX_FIFO0, &rxHeader, data) != HAL_OK) return;
 
-    message.id = rxHeader.ExtId;
+    if (rxHeader.IDE == CAN_ID_EXT) message.id = rxHeader.ExtId;
+    else message.id = rxHeader.StdId;
     message.dlc = rxHeader.DLC;
     message.isExtended = (rxHeader.IDE == CAN_ID_EXT);
     message.source = (hcan->Instance == CAN1) ? 1 : 2;