diff --git a/CanPorts.c b/CanPorts.c
index 4cf71d7..1a2c933 100644
--- a/CanPorts.c
+++ b/CanPorts.c
@@ -19,9 +19,8 @@ static void CAN0_ErrorInterrupt_CallBack(uint8_t u8CanIndex, FLEXCAN_ErrorInfoTy
     PROCESS_UNUSED_VAR(pErrorInfo);
 }
 
-osMessageQueueId_t txDataQueueCan0 = NULL;
 static void CAN0_TxInterruptCallBackType(uint8_t u8CanIndex, uint8_t u8TxHandler) {
-    osMessageQueuePut(txDataQueueCan0, &u8TxHandler, 0x0, 0U);
+    osMessageQueuePut(CAN_PORTS.Can0.txDataQueueCan, &u8TxHandler, 0x0, 0U);
 }
 
 static void CAN1_ErrorInterrupt_CallBack(uint8_t u8CanIndex, FLEXCAN_ErrorInfoType *pErrorInfo) {
@@ -30,9 +29,8 @@ static void CAN1_ErrorInterrupt_CallBack(uint8_t u8CanIndex, FLEXCAN_ErrorInfoTy
     PROCESS_UNUSED_VAR(pErrorInfo);
 }
 
-osMessageQueueId_t txDataQueueCan1 = NULL;
 static void CAN1_TxInterruptCallBackType(uint8_t u8CanIndex, uint8_t u8TxHandler) {
-    osMessageQueuePut(txDataQueueCan1, &u8TxHandler, 0x0, 0U);
+    osMessageQueuePut(CAN_PORTS.Can1.txDataQueueCan, &u8TxHandler, 0x0, 0U);
 }
 
 #if (CAN_DMA_EN == 1)
@@ -188,8 +186,6 @@ static bool vCanPort_InitCan0() {
 
     vCanPort_InitCAN0RxTxPin();
 
-    txDataQueueCan0 = osMessageQueueNew(1, 1, NULL);
-
 #if (CAN_DMA_EN == 1)
     bool result = vCanSerialPortFrameDMAInit(
             &CAN_PORTS.Can0,
@@ -295,8 +291,6 @@ static bool vCanPort_InitCan1() {
 
     vCanPort_InitCAN1RxTxPin();
 
-    txDataQueueCan1 = osMessageQueueNew(1, 1, NULL);
-
 #if (CAN_DMA_EN == 1)
     bool result = vCanSerialPortFrameDMAInit(
             &CAN_PORTS.Can1,