diff --git a/Firmware/RTK_Surveyor/Tasks.ino b/Firmware/RTK_Surveyor/Tasks.ino
index 578022aa2..b0cb2ea0d 100644
--- a/Firmware/RTK_Surveyor/Tasks.ino
+++ b/Firmware/RTK_Surveyor/Tasks.ino
@@ -295,7 +295,7 @@ void ButtonCheckTask(void *e)
                 //If only one active profile do not show any profiles
                 index = getProfileNumberFromUnit(0);
                 displayProfile = getProfileNumberFromUnit(1);
-                setupState = (index >= MAX_PROFILE_COUNT) ? STATE_MARK_EVENT : STATE_PROFILE;
+                setupState = (index >= displayProfile) ? STATE_MARK_EVENT : STATE_PROFILE;
                 displayProfile = 0;
                 break;
               case STATE_PROFILE:
@@ -410,7 +410,7 @@ void ButtonCheckTask(void *e)
                 //If only one active profile do not show any profiles
                 index = getProfileNumberFromUnit(0);
                 displayProfile = getProfileNumberFromUnit(1);
-                setupState = (index >= MAX_PROFILE_COUNT) ? STATE_MARK_EVENT : STATE_PROFILE;
+                setupState = (index >= displayProfile) ? STATE_MARK_EVENT : STATE_PROFILE;
                 displayProfile = 0;
                 break;
               case STATE_PROFILE: