diff --git a/.gitignore b/.gitignore
index e1d954b7..8d416f85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ CMakeFiles/
 **/CMakeCache.txt
 cmake_install.cmake
 Makefile
+build/
 
 # Resulting binary files
 *.a
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index dac4ce29..f82bfc6a 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -105,8 +105,12 @@ void SystemTask::Work() {
   #pragma clang diagnostic push
   #pragma ide diagnostic ignored "EndlessLoop"
   while(true) {
+
     uint8_t msg;
     if (xQueueReceive(systemTasksMsgQueue, &msg, isSleeping ? 2500 : 1000)) {
+      uint32_t systick_counter = nrf_rtc_counter_get(portNRF_RTC_REG);
+      dateTimeController.UpdateTime(systick_counter);
+      batteryController.Update();
       Messages message = static_cast<Messages >(msg);
       switch(message) {
         case Messages::GoToRunning:
@@ -190,10 +194,6 @@ void SystemTask::Work() {
       }
     }
 
-    uint32_t systick_counter = nrf_rtc_counter_get(portNRF_RTC_REG);
-    dateTimeController.UpdateTime(systick_counter);
-    batteryController.Update();
-
     monitor.Process();
 
     if(!nrf_gpio_pin_read(pinButton))