diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb
index a4c0878d0..8d1884fc2 100644
--- a/app/models/validations/setup_validations.rb
+++ b/app/models/validations/setup_validations.rb
@@ -77,7 +77,9 @@ module Validations::SetupValidations
 
     if record.scheme.status == :incomplete
       record.errors.add :scheme_id, :incomplete, message: I18n.t("validations.lettings.setup.scheme.incomplete")
-    elsif record.scheme.locations.nil? || (record.scheme.locations.present? && record.scheme.locations.confirmed.none?)
+    end
+
+    if record.scheme.locations.nil? || (record.scheme.locations.present? && record.scheme.locations.confirmed.none?)
       record.errors.add :scheme_id, :no_completed_locations, message: I18n.t("validations.lettings.setup.scheme.no_completed_locations")
     end