diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46d5fa9ffef..0e5e535ed92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 List of the most important changes for each release.
 
+## 0.17.4
+
+### Fixed
+- Ensures users can 'Continue' from the SelectFacilityForm component in SetupWizard by @rtibbles in https://github.com/learningequality/kolibri/pull/12893
+
+
 ## 0.17.3
 
 ### Changed
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/SelectFacilityForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/SelectFacilityForm.vue
index c6a383b8ef0..9ad11203860 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/SelectFacilityForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/SelectFacilityForm.vue
@@ -8,7 +8,7 @@
     :footerMessageType="loading ? null : footerMessageType"
     :step="loading ? null : 1"
     :steps="loading ? null : 5"
-    :hideContinue="true"
+    :hideContinue="Boolean(errorMessage)"
     @continue="handleContinue"
   >
     <UiAlert