diff --git a/apps/settings/Makefile b/apps/settings/Makefile
index 2b1f3ccfd..0c7076453 100644
--- a/apps/settings/Makefile
+++ b/apps/settings/Makefile
@@ -21,11 +21,11 @@ apps_prompt_beta_src += apps/settings/main_controller_prompt_beta.cpp
 apps_prompt_update_src += apps/settings/main_controller_prompt_update.cpp
 
 apps_settings_official += $(addprefix apps/settings/,\
-  sub_menu/exam_mode_controller_multi.cpp \
+  sub_menu/exam_mode_controller_official.cpp \
 )
 
 apps_settings_non_official += $(addprefix apps/settings/,\
-  sub_menu/exam_mode_controller_single.cpp \
+  sub_menu/exam_mode_controller_non_official.cpp \
 )
 
 i18n_files += $(addprefix apps/settings/,\
diff --git a/apps/settings/sub_menu/exam_mode_controller.cpp b/apps/settings/sub_menu/exam_mode_controller.cpp
index c61a5d8a9..2706f24d3 100644
--- a/apps/settings/sub_menu/exam_mode_controller.cpp
+++ b/apps/settings/sub_menu/exam_mode_controller.cpp
@@ -60,7 +60,7 @@ void ExamModeController::ContentView::layoutSubviews(bool force) {
 }
 
 int ExamModeController::ContentView::numberOfMessages() const {
-  return GlobalPreferences::sharedGlobalPreferences()->isInExamMode() ? k_numberOfDeactivationMessageLines : k_maxNumberOfLines;
+  return GlobalPreferences::sharedGlobalPreferences()->isInExamMode() ? k_numberOfDeactivationMessageLines : numberOfCautionLines();
 }
 
 ExamModeController::ExamModeController(Responder * parentResponder) :
@@ -88,9 +88,9 @@ void ExamModeController::didEnterResponderChain(Responder * previousFirstRespond
   if (GlobalPreferences::sharedGlobalPreferences()->isInExamMode()) {
     I18n::Message deactivateMessages[] = {I18n::Message::ToDeactivateExamMode1, I18n::Message::ToDeactivateExamMode2, I18n::Message::ToDeactivateExamMode3, I18n::Message::Default, I18n::Message::Default, I18n::Message::Default};
     m_contentView.setMessages(deactivateMessages);
-  } else {
-    I18n::Message warningMessages[] = {I18n::Message::ExamModeWarning1, I18n::Message::ExamModeWarning2, I18n::Message::ExamModeWarning3, I18n::Message::ExamModeWarning4, I18n::Message::ExamModeWarning5, I18n::Message::ExamModeWarning6};
-    m_contentView.setMessages(warningMessages);
+  } else if (m_contentView.numberOfCautionLines() > 0) {
+    I18n::Message cautionMessages[] = {I18n::Message::ExamModeWarning1, I18n::Message::ExamModeWarning2, I18n::Message::ExamModeWarning3, I18n::Message::ExamModeWarning4, I18n::Message::ExamModeWarning5, I18n::Message::ExamModeWarning6};
+    m_contentView.setMessages(cautionMessages);
   }
 }
 
diff --git a/apps/settings/sub_menu/exam_mode_controller.h b/apps/settings/sub_menu/exam_mode_controller.h
index bd440e6ba..e1d052749 100644
--- a/apps/settings/sub_menu/exam_mode_controller.h
+++ b/apps/settings/sub_menu/exam_mode_controller.h
@@ -24,6 +24,7 @@ private:
     static constexpr int k_maxNumberOfLines = 6;
     static constexpr int k_numberOfDeactivationMessageLines = 3;
     void setMessages(I18n::Message m[k_maxNumberOfLines]);
+    int numberOfCautionLines() const;
   private:
     int numberOfMessages() const;
     int numberOfSubviews() const override { return 1 + numberOfMessages(); }
diff --git a/apps/settings/sub_menu/exam_mode_controller_single.cpp b/apps/settings/sub_menu/exam_mode_controller_non_official.cpp
similarity index 73%
rename from apps/settings/sub_menu/exam_mode_controller_single.cpp
rename to apps/settings/sub_menu/exam_mode_controller_non_official.cpp
index 6aee89694..5b5eb296e 100644
--- a/apps/settings/sub_menu/exam_mode_controller_single.cpp
+++ b/apps/settings/sub_menu/exam_mode_controller_non_official.cpp
@@ -5,6 +5,10 @@ using namespace Shared;
 
 namespace Settings {
 
+int ExamModeController::ContentView::numberOfCautionLines() const {
+  return k_maxNumberOfLines;
+}
+
 GlobalPreferences::ExamMode ExamModeController::examMode() {
   return GlobalPreferences::ExamMode::Standard;
 }
diff --git a/apps/settings/sub_menu/exam_mode_controller_multi.cpp b/apps/settings/sub_menu/exam_mode_controller_official.cpp
similarity index 91%
rename from apps/settings/sub_menu/exam_mode_controller_multi.cpp
rename to apps/settings/sub_menu/exam_mode_controller_official.cpp
index 6938b15c8..f41739630 100644
--- a/apps/settings/sub_menu/exam_mode_controller_multi.cpp
+++ b/apps/settings/sub_menu/exam_mode_controller_official.cpp
@@ -5,6 +5,10 @@ using namespace Shared;
 
 namespace Settings {
 
+int ExamModeController::ContentView::numberOfCautionLines() const {
+  return 0;
+}
+
 GlobalPreferences::ExamMode ExamModeController::examMode() {
   GlobalPreferences::ExamMode mode = GlobalPreferences::ExamMode::Standard;
   if (GlobalPreferences::sharedGlobalPreferences()->isInExamMode()) {