diff --git a/src/app/form/form.component.html b/src/app/form/form.component.html
index 9baca98e4f23841d6d88744a10c19460bc5cdd93..9b76a819f0bf8c02d064814d464882358c4beef3 100644
--- a/src/app/form/form.component.html
+++ b/src/app/form/form.component.html
@@ -807,7 +807,13 @@
           <h3>Proposez-vous le wifi en accès libre ?</h3>
         </div>
         <app-radio-form
-          [selectedOption]="isEditMode ? isInArray('wifiEnAccesLibre', 'equipmentsAndServices') : null"
+          [selectedOption]="
+            isEditMode
+              ? isInArray('wifiEnAccesLibre', 'equipmentsAndServices')
+              : isWifiChoosen
+              ? isInArray('wifiEnAccesLibre', 'equipmentsAndServices')
+              : null
+          "
           (selectedEvent)="onCheckChange($event, 'equipmentsAndServices', 'wifiEnAccesLibre')"
         >
         </app-radio-form>
diff --git a/src/app/form/form.component.ts b/src/app/form/form.component.ts
index dcc151211a8f72f9e0b65eb1e66852d31a7457a1..769104607de5d09bddcbffc238c0fa979c1a5f03 100644
--- a/src/app/form/form.component.ts
+++ b/src/app/form/form.component.ts
@@ -71,7 +71,7 @@ export class FormComponent implements OnInit {
   public isAccountMode = false;
   public isJoinMode = false;
   public isLoading = false;
-  public isWifiChoosen = false;
+  public isWifiChoosen = null;
   public structureWithOwners: StructureWithOwners;
 
   constructor(