diff --git a/base/forms.py b/base/forms.py
index b7619be04..81030dc55 100644
--- a/base/forms.py
+++ b/base/forms.py
@@ -2771,6 +2771,8 @@ class CompanyLeaveForm(ModelForm):
         Custom initialization to configure the 'based_on' field.
         """
         super().__init__(*args, **kwargs)
+        choices = [("", "All")] + list(self.fields["based_on_week"].choices[1:])
+        self.fields["based_on_week"].choices = choices
         self.fields["based_on_week"].widget.option_template_name = (
             "horilla_widgets/select_option.html"
         )
diff --git a/horilla_widgets/templates/horilla_widgets/select_option.html b/horilla_widgets/templates/horilla_widgets/select_option.html
index 3933c5ab8..01c7d353e 100644
--- a/horilla_widgets/templates/horilla_widgets/select_option.html
+++ b/horilla_widgets/templates/horilla_widgets/select_option.html
@@ -1 +1 @@
-<option value="{{ widget.value|stringformat:'s' }}" {% include "horilla_widgets/attr.html" %}>{{ widget.label }}</option>
+<option value="{{ widget.value|stringformat:'s' }}" {% include "horilla_widgets/attr.html" %} {% if widget.selected %} selected="selected"{% endif %} >{{ widget.label }}</option>