diff --git a/Dashboard/Dashboard.ino b/Dashboard/Dashboard.ino
index 473e57a7848fe6f78388722c60c2b179fa4a992e..302a230dc33ceca9d54234e54224887149203c99 100644
--- a/Dashboard/Dashboard.ino
+++ b/Dashboard/Dashboard.ino
@@ -563,7 +563,7 @@ void loop()
     static uint32_t timer5 = 0;
     TIMER(timer5, 20000) 
     {
-        if(!globalVars.noAutoChangeScreen)
+        if(!globalVars.noAutoChangeScreen && globalVars.currentScreen != homeScreen)
         {
             matrix.clear();
             globalVars.currentScreen = homeScreen;
@@ -611,7 +611,7 @@ void loop()
         globalVars.pomodoroTimer = 0;
         tb.resetTimers();
         #if(DEBUG)
-        timer_debug0 = 0;
+            timer_debug0 = 0;
         #endif
         timer0 = 0;
         timer1 = 0;