diff --git a/src/app/models/structure.model.ts b/src/app/models/structure.model.ts
index 53141cc4f526a3e1f00df12a81006b4a5cbabd59..eaf076cfe15b51d8da3c7fc1ea37dc37af9d915d 100644
--- a/src/app/models/structure.model.ts
+++ b/src/app/models/structure.model.ts
@@ -27,7 +27,7 @@ export class Structure {
   public contactSurname: string = null;
   public fonction: string = null;
   public lockdownActivity: string = null;
-  public pmrAccess: boolean = false;
+  public pmrAccess: boolean = null;
   public publicsAccompaniment: string[] = [];
   public proceduresAccompaniment: string[] = [];
   public accessModality: string[] = [];
@@ -43,8 +43,8 @@ export class Structure {
   public hours: Week;
   public equipmentsDetails: string = null;
   public equipmentsAccessType: string[] = [];
-  public freeWorkShop: boolean = false;
-  public freeWifi: boolean = false;
+  public freeWorkShop: boolean = null;
+  public freeWifi: boolean = null;
 
   public isOpen: boolean = false;
   public openedOn: OpeningDay = new OpeningDay();
diff --git a/src/app/shared/components/radio-form/radio-form.component.html b/src/app/shared/components/radio-form/radio-form.component.html
index c3781da41d3b5cb05b0ac8ecfecf990343709b6a..42570b7d703df7efdd97b4cc47e656e9f7152700 100644
--- a/src/app/shared/components/radio-form/radio-form.component.html
+++ b/src/app/shared/components/radio-form/radio-form.component.html
@@ -1,6 +1,6 @@
 <button
   (click)="clicked(true)"
-  [ngClass]="{ selected: selectedOption }"
+  [ngClass]="{ selected: selectedOption && selectedOption != null }"
   fxLayout="row"
   fxLayoutAlign=" center"
   fxLayoutGap="17px"
@@ -14,7 +14,7 @@
 </button>
 <button
   (click)="clicked(false)"
-  [ngClass]="{ selected: !selectedOption }"
+  [ngClass]="{ selected: !selectedOption && selectedOption != null }"
   fxLayout="row"
   fxLayoutAlign=" center"
   fxLayoutGap="17px"