diff --git a/firmware/RAMNV1/Core/Src/main.c b/firmware/RAMNV1/Core/Src/main.c
index cdc1e6a..82a6b7e 100644
--- a/firmware/RAMNV1/Core/Src/main.c
+++ b/firmware/RAMNV1/Core/Src/main.c
@@ -1656,7 +1656,7 @@ void RAMN_ReceiveCANFunc(void *argument)
 
 				if (RAMN_USB_Config.slcan_enableTimestamp != 0U)
 				{
-					index += uint16toASCII(xTaskGetTickCount() % 0xEA60,&slCAN_USBTxBuffer[index]);
+					index += uint16toASCII((xTaskGetTickCount() * (1000 /*ms per sec*/ / configTICK_RATE_HZ) ) % 0xEA60 /* 60,000 ms*/,&slCAN_USBTxBuffer[index]);
 				}
 
 				if ((RAMN_USB_Config.addESIFlag != 0U) && (CANRxHeader.FDFormat == FDCAN_FD_CAN) && (CANRxHeader.ErrorStateIndicator == FDCAN_ESI_PASSIVE))
diff --git a/firmware/RAMNV1/Core/Src/ramn_gsusb.c b/firmware/RAMNV1/Core/Src/ramn_gsusb.c
index 9922610..5d71ba6 100644
--- a/firmware/RAMNV1/Core/Src/ramn_gsusb.c
+++ b/firmware/RAMNV1/Core/Src/ramn_gsusb.c
@@ -47,7 +47,7 @@ RAMN_Result_t RAMN_GSUSB_ProcessRX(FDCAN_RxHeaderTypeDef *canRxHeader, uint8_t *
 		frameData->channel = 0;
 		frameData->flags = 0;
 		frameData->can_dlc = canRxHeader->DataLength;
-		frameData->timestamp_us = 0;
+		frameData->timestamp_us = (xTaskGetTickCount() * (1000000 /*us per sec*/ / configTICK_RATE_HZ) );
 
 		if (!(frameData->can_id & CAN_RTR_FLAG)) RAMN_memcpy(frameData->data, canRxData, frameData->can_dlc);
 
@@ -88,7 +88,7 @@ RAMN_Result_t RAMN_GSUSB_ProcessTX(FDCAN_TxHeaderTypeDef *canTxHeader, uint8_t *
 		frameData->echo_id = 0xFFFFFFFF;
 		frameData->channel = 0;
 		frameData->can_dlc = canTxHeader->DataLength;
-		frameData->timestamp_us = 0;
+		frameData->timestamp_us = 0;  // timestamps are ignored on send
 		RAMN_memcpy(frameData->data, canRxData, frameData->can_dlc);
 
 		// Send to task
diff --git a/firmware/RAMNV1/Middlewares/ST/STM32_USB_Device_Library/USBClass/Composite/gs_usb/usbd_gs_usb.h b/firmware/RAMNV1/Middlewares/ST/STM32_USB_Device_Library/USBClass/Composite/gs_usb/usbd_gs_usb.h
index f157123..6d1b165 100644
--- a/firmware/RAMNV1/Middlewares/ST/STM32_USB_Device_Library/USBClass/Composite/gs_usb/usbd_gs_usb.h
+++ b/firmware/RAMNV1/Middlewares/ST/STM32_USB_Device_Library/USBClass/Composite/gs_usb/usbd_gs_usb.h
@@ -43,10 +43,9 @@ THE SOFTWARE.
 #define GS_CAN_MODE_NORMAL                      0
 #define GS_CAN_MODE_LISTEN_ONLY                 (1<<0)
 #define GS_CAN_MODE_INTERNAL_LOOP_BACK          (1<<1)
-#define GS_CAN_MODE_EXTERNAL_LOOP_BACK          (1<<2)
-#define GS_CAN_MODE_TRIPLE_SAMPLE               (1<<3)
-#define GS_CAN_MODE_ONE_SHOT                    (1<<4)
-#define GS_CAN_MODE_HW_TIMESTAMP                (1<<5)
+#define GS_CAN_MODE_TRIPLE_SAMPLE               (1<<2)
+#define GS_CAN_MODE_ONE_SHOT                    (1<<3)
+#define GS_CAN_MODE_HW_TIMESTAMP                (1<<4)
 
 #define GS_CAN_MODE_PAD_PKTS_TO_MAX_PKT_SIZE    (1<<7)