diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart
index 8f1455ad..7744dee7 100644
--- a/lib/core/api_consts.dart
+++ b/lib/core/api_consts.dart
@@ -301,7 +301,7 @@ class ApiConsts {
   static String googleCloudStorageENTranslationFileBaseURL = "https://storage.googleapis.com/hmg-patientapp-translations";
 
   // ************     static values for Api   ****************
-  static final double appVersionID = 21.7;
+  static final double appVersionID = 21.8;
 
   // static final double appVersionID = 50.7;
   static final int appChannelId = 3;
diff --git a/lib/features/authentication/authentication_view_model.dart b/lib/features/authentication/authentication_view_model.dart
index fdc16943..7688cfa4 100644
--- a/lib/features/authentication/authentication_view_model.dart
+++ b/lib/features/authentication/authentication_view_model.dart
@@ -980,15 +980,15 @@ class AuthenticationViewModel extends ChangeNotifier {
     // TODO: GET APP SMS SIGNATURE HERE
     request.sMSSignature = await getSignature();
 
-    if(!kDebugMode) {
-      // Get Turnstile token if configured
-      final turnstileToken = await _turnstileService.getTurnstileToken();
-      if (turnstileToken != null) {
-        request.turnstileToken = turnstileToken;
-      } else {
-        request.turnstileToken = "";
-      }
-    }
+    // if(!kDebugMode) {
+    //   // Get Turnstile token if configured
+    //   final turnstileToken = await _turnstileService.getTurnstileToken();
+    //   if (turnstileToken != null) {
+    //     request.turnstileToken = turnstileToken;
+    //   } else {
+    //     request.turnstileToken = "";
+    //   }
+    // }
 
     if (isNeedLoading) {
       LoaderBottomSheet.showLoader();
diff --git a/lib/presentation/appointments/widgets/appointment_card.dart b/lib/presentation/appointments/widgets/appointment_card.dart
index e98eda82..91ebaa14 100644
--- a/lib/presentation/appointments/widgets/appointment_card.dart
+++ b/lib/presentation/appointments/widgets/appointment_card.dart
@@ -14,6 +14,7 @@ import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/features/book_appointments/book_appointments_view_model.dart';
 import 'package:hmg_patient_app_new/features/book_appointments/models/resp_models/doctors_list_response_model.dart';
+import 'package:hmg_patient_app_new/features/book_appointments/models/resp_models/get_clinic_list_response_model.dart';
 import 'package:hmg_patient_app_new/features/contact_us/contact_us_view_model.dart';
 import 'package:hmg_patient_app_new/features/medical_file/medical_file_view_model.dart';
 import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_appointment_history_response_model.dart';
@@ -677,7 +678,15 @@ class _AppointmentCardState extends State<AppointmentCard> {
       projectName: widget.patientAppointmentHistoryResponseModel.projectName,
     );
 
+    final clinic = GetClinicsListResponseModel(
+      clinicID: widget.patientAppointmentHistoryResponseModel.clinicID,
+      clinicDescription: widget.patientAppointmentHistoryResponseModel.clinicName,
+      clinicDescriptionN: widget.patientAppointmentHistoryResponseModel.clinicName,
+    );
+
     widget.bookAppointmentsViewModel.setSelectedDoctor(doctor);
+    widget.bookAppointmentsViewModel.setSelectedClinic(clinic);
+
     LoaderBottomSheet.showLoader();
 
     await widget.bookAppointmentsViewModel.getDoctorFreeSlots(
diff --git a/lib/presentation/book_appointment/doctor_profile_page.dart b/lib/presentation/book_appointment/doctor_profile_page.dart
index 6be110ec..a3b4aa48 100644
--- a/lib/presentation/book_appointment/doctor_profile_page.dart
+++ b/lib/presentation/book_appointment/doctor_profile_page.dart
@@ -8,6 +8,7 @@ import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/features/book_appointments/book_appointments_view_model.dart';
+import 'package:hmg_patient_app_new/features/book_appointments/models/resp_models/get_clinic_list_response_model.dart';
 import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_view_model.dart';
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/presentation/book_appointment/widgets/appointment_calendar.dart';
@@ -240,6 +241,14 @@ class DoctorProfilePage extends StatelessWidget {
                       bookAppointmentsViewModel.selectedDoctor.clinicName = bookAppointmentsViewModel.doctorsProfileResponseModel.clinicDescription;
                       bookAppointmentsViewModel.selectedDoctor.projectName = bookAppointmentsViewModel.doctorsProfileResponseModel.projectName;
 
+                      final clinic = GetClinicsListResponseModel(
+                        clinicID: bookAppointmentsViewModel.doctorsProfileResponseModel.clinicID,
+                        clinicDescription: bookAppointmentsViewModel.doctorsProfileResponseModel.clinicDescription,
+                        clinicDescriptionN: bookAppointmentsViewModel.doctorsProfileResponseModel.clinicDescription,
+                      );
+
+                      bookAppointmentsViewModel.setSelectedClinic(clinic);
+
                       LoaderBottomSheet.showLoader();
                       bookAppointmentsViewModel.isLiveCareSchedule
                           ? await bookAppointmentsViewModel.getLiveCareDoctorFreeSlots(
diff --git a/lib/presentation/book_appointment/widgets/appointment_calendar.dart b/lib/presentation/book_appointment/widgets/appointment_calendar.dart
index 11092c79..bc6e214c 100644
--- a/lib/presentation/book_appointment/widgets/appointment_calendar.dart
+++ b/lib/presentation/book_appointment/widgets/appointment_calendar.dart
@@ -268,7 +268,7 @@ class _AppointmentCalendarState extends State<AppointmentCalendar> {
                     ),
                   );
                 } else {
-                  if (bookAppointmentsViewModel.selectedClinic.clinicID! == 17 && bookAppointmentsViewModel.selectedChiefComplaintID == 0) {
+                  if (bookAppointmentsViewModel.selectedClinic.clinicID == 17 && bookAppointmentsViewModel.selectedChiefComplaintID == 0) {
                     GetClinicsListResponseModel selectedClinic = GetClinicsListResponseModel(
                         clinicID: bookAppointmentsViewModel.selectedClinic.clinicID,
                         clinicDescription: bookAppointmentsViewModel.selectedClinic.clinicDescription,
diff --git a/pubspec.yaml b/pubspec.yaml
index 006aca7f..df7ce33e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,8 +2,8 @@ name: hmg_patient_app_new
 description: "New HMG Patient App"
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 0.0.39+38
-#version: 0.0.8+1
+#version: 0.0.40+41
+version: 0.0.11+1
 
 environment:
   sdk: ">=3.6.0 <4.0.0"