diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4ca051484..fd65797b61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ## Fixed
 
+- #2154 The expert mode debug screen is now only accessible after the expert mode warning has been acknowledged.
 - #2074 Scrolling the action or trigger list no longer accidentally moves items; reordering by drag now only activates from the drag handle or via long-press.
 
 ## Changed
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/expertmode/ExpertModeScreen.kt b/base/src/main/java/io/github/sds100/keymapper/base/expertmode/ExpertModeScreen.kt
index eb1e4c1e8b..d843f45bc1 100644
--- a/base/src/main/java/io/github/sds100/keymapper/base/expertmode/ExpertModeScreen.kt
+++ b/base/src/main/java/io/github/sds100/keymapper/base/expertmode/ExpertModeScreen.kt
@@ -252,6 +252,27 @@ private fun Content(
                     )
                 }
             }
+
+            Spacer(modifier = Modifier.height(16.dp))
+
+            OptionsHeaderRow(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp),
+                icon = Icons.Outlined.BugReport,
+                text = stringResource(R.string.settings_section_debugging_title),
+            )
+
+            Spacer(modifier = Modifier.height(8.dp))
+
+            OptionPageButton(
+                modifier = Modifier.padding(horizontal = 8.dp),
+                title = stringResource(R.string.title_pref_get_event_debug),
+                text = stringResource(R.string.summary_pref_get_event_debug),
+                icon = Icons.Outlined.BugReport,
+                onClick = onGetEventClick,
+            )
+            Spacer(modifier = Modifier.height(8.dp))
         } else {
             Text(
                 modifier = Modifier.padding(horizontal = 32.dp),
@@ -259,27 +280,6 @@ private fun Content(
                 textAlign = TextAlign.Center,
             )
         }
-
-        Spacer(modifier = Modifier.height(16.dp))
-
-        OptionsHeaderRow(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 16.dp),
-            icon = Icons.Outlined.BugReport,
-            text = stringResource(R.string.settings_section_debugging_title),
-        )
-
-        Spacer(modifier = Modifier.height(8.dp))
-
-        OptionPageButton(
-            modifier = Modifier.padding(horizontal = 8.dp),
-            title = stringResource(R.string.title_pref_get_event_debug),
-            text = stringResource(R.string.summary_pref_get_event_debug),
-            icon = Icons.Outlined.BugReport,
-            onClick = onGetEventClick,
-        )
-        Spacer(modifier = Modifier.height(8.dp))
     }
 }
 
diff --git a/base/src/main/java/io/github/sds100/keymapper/base/expertmode/ExpertModeViewModel.kt b/base/src/main/java/io/github/sds100/keymapper/base/expertmode/ExpertModeViewModel.kt
index 7130911276..ecc4da5437 100644
--- a/base/src/main/java/io/github/sds100/keymapper/base/expertmode/ExpertModeViewModel.kt
+++ b/base/src/main/java/io/github/sds100/keymapper/base/expertmode/ExpertModeViewModel.kt
@@ -190,6 +190,7 @@ class ExpertModeViewModel @Inject constructor(
 
     fun onGetEventClick() {
         viewModelScope.launch {
+            if (warningState.value !is ExpertModeWarningState.Understood) return@launch
             navigate("get_event_debug", NavDestination.GetEvent)
         }
     }