diff --git a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
index ff1c83f90..6c2f996df 100644
--- a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
+++ b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
@@ -78,7 +78,14 @@ class _AdvancedPrivacySettingsBodyState extends State<AdvancedPrivacySettingsBod
           children: [
             LoadingPrimaryButton(
               onPressed: () {
-                widget.nodeViewModel.save(saveAsCurrent: true);
+                if (widget.privacySettingsViewModel.addCustomNode) {
+                  if (_formKey.currentState != null && !_formKey.currentState!.validate()) {
+                    return;
+                  }
+
+                  widget.nodeViewModel.save(saveAsCurrent: true);
+                }
+
                 Navigator.pop(context);
               },
               text: S.of(context).continue_text,