diff --git a/application/controllers/Calendar.php b/application/controllers/Calendar.php
index d2d830a9..4ca0ea46 100644
--- a/application/controllers/Calendar.php
+++ b/application/controllers/Calendar.php
@@ -129,7 +129,7 @@ class Calendar extends EA_Controller {
             'timezones' => $this->timezones->to_array(),
             'privileges' => $privileges,
             'calendar_view' => $calendar_view,
-            'available_providers' => $available_providers,
+            'available_providers' => array_values($available_providers), // Strip keys to prevent unintended array-to-object conversion
             'available_services' => $available_services,
             'secretary_providers' => $secretary_providers,
             'edit_appointment' => $edit_appointment,
diff --git a/assets/js/utils/calendar_table_view.js b/assets/js/utils/calendar_table_view.js
index 077d6958..aaf43827 100755
--- a/assets/js/utils/calendar_table_view.js
+++ b/assets/js/utils/calendar_table_view.js
@@ -878,7 +878,7 @@ App.Utils.CalendarTableView = (function () {
         const workDateStart = moment(start.format('YYYY-MM-DD') + ' ' + workingPlan[selDayName].start);
 
         if (start < workDateStart) {
-            unavailabilityPeriod = {
+            const unavailabilityPeriod = {
                 title: lang('not_working'),
                 start: start.toDate(),
                 end: workDateStart.toDate(),