diff --git a/src/app/shared/components/hour-picker/hour-picker.component.ts b/src/app/shared/components/hour-picker/hour-picker.component.ts
index 38ec063e87744d575477d7785e8147e400b0c7bf..4b8ae1e30ed3dd178736091a437188b3e59574f0 100644
--- a/src/app/shared/components/hour-picker/hour-picker.component.ts
+++ b/src/app/shared/components/hour-picker/hour-picker.component.ts
@@ -95,31 +95,29 @@ export class HourPickerComponent implements OnChanges, OnDestroy {
       if (element.name.toLowerCase() === key) {
         element.open = day.open;
         element.active = day.open;
-        element.hours = day.time
-          .map((hour: Time) => {
-            if (hour.opening && hour.closing) {
+        element.hours = day.time.map((hour: Time) => {
+          if (hour.opening && hour.closing) {
+            return {
+              start: hour.opening,
+              end: hour.closing,
+              error: null,
+            };
+          } else {
+            if (hour.opening) {
               return {
                 start: hour.opening,
-                end: hour.closing,
-                error: null,
+                end: '',
+                error: 'incomplete',
               };
             } else {
-              if (hour.opening) {
-                return {
-                  start: hour.opening,
-                  end: '',
-                  error: 'incomplete',
-                };
-              } else {
-                return {
-                  start: '',
-                  end: hour.closing,
-                  error: 'incomplete',
-                };
-              }
+              return {
+                start: '',
+                end: hour.closing,
+                error: 'incomplete',
+              };
             }
-          })
-          .filter((item) => item);
+          }
+        });
       }
     });
     this.checkHoursValid();
@@ -196,9 +194,9 @@ export class HourPickerComponent implements OnChanges, OnDestroy {
   }
 
   public toggleOpenDay(day: any, event: MouseEvent): void {
-    const target = event.target as HTMLButtonElement;
-    day.open = target.value;
-    if (!target.value) {
+    const target = event.target as HTMLInputElement;
+    day.open = target.checked;
+    if (!target.checked) {
       day.hours = [];
     }
     this.submitForm();