diff --git a/Core/Inc/canlog.h b/Core/Inc/canlog.h
index 2819534..679bcde 100644
--- a/Core/Inc/canlog.h
+++ b/Core/Inc/canlog.h
@@ -24,6 +24,10 @@
 
 #include "main.h"
 
+/* Decladerations for queues */
+extern osMessageQueueId_t xCAN1RxQueue;
+extern osMessageQueueId_t xCAN2RxQueue;
+
 /* Decladerations for thread handles and attributes */
 extern osThreadId_t vCAN1_rx;
 extern osThreadId_t vCAN2_rx;
diff --git a/Core/Src/main.c b/Core/Src/main.c
index 7c1db14..bc4778d 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -159,8 +159,13 @@ int main(void)
   /* USER CODE END RTOS_TIMERS */
 
   /* USER CODE BEGIN RTOS_QUEUES */
-  QueueHandle_t xCAN1rxQueue;
-  QueueHandle_t xCAN2rxQueue;
+  osMessageQueueId_t xCAN1RxQueue;
+  xCAN1RxQueue = osMessageQueueNew(32, sizeof(CanMessage_t), NULL);
+
+  osMessageQueueId_t xCAN2RxQueue;
+  xCAN2RxQueue = osMessageQueueNew(32, sizeof(CanMessage_t), NULL);
+
+  if (xCAN1RxQueue == NULL || xCAN2RxQueue == NULL) Error_Handler();
   /* USER CODE END RTOS_QUEUES */
 
   /* USER CODE BEGIN RTOS_THREADS */