diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_page.dart b/packages/hms_room_kit/lib/src/meeting/meeting_page.dart
index 3d5dfc85b..f290bffd7 100644
--- a/packages/hms_room_kit/lib/src/meeting/meeting_page.dart
+++ b/packages/hms_room_kit/lib/src/meeting/meeting_page.dart
@@ -94,6 +94,7 @@ class _MeetingPageState extends State<MeetingPage> {
           builder: (_, failureErrors, __) {
             if (failureErrors.item1) {
               WidgetsBinding.instance.addPostFrameCallback((_) {
+                context.read<MeetingStore>().removeAllBottomSheets();
                 Navigator.of(context).pushReplacement(MaterialPageRoute(
                     builder: (context) => HMSLeftRoomScreen(
                           isEndRoomCalled: failureErrors.item3,
diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
index 50bc49a90..a3730dd64 100644
--- a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
+++ b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
@@ -1433,7 +1433,6 @@ class MeetingStore extends ChangeNotifier
 
   void clearRoomState() async {
     // clearPIPState();
-    removeAllBottomSheets();
     removeListeners();
     toggleAlwaysScreenOn();
 
diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/end_service_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/end_service_bottom_sheet.dart
index 6e7819beb..ac0f3cfd2 100644
--- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/end_service_bottom_sheet.dart
+++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/end_service_bottom_sheet.dart
@@ -106,6 +106,7 @@ class _EndServiceBottomSheetState extends State<EndServiceBottomSheet> {
                     if (widget.onButtonPressed != null) {
                       widget.onButtonPressed!();
                     }
+                    context.read<MeetingStore>().removeBottomSheet(context);
                     Navigator.pop(context);
                   },
                   child: SizedBox(
diff --git a/packages/hmssdk_flutter/example/android/app/build.gradle b/packages/hmssdk_flutter/example/android/app/build.gradle
index 6918a4c48..bd317f8f6 100644
--- a/packages/hmssdk_flutter/example/android/app/build.gradle
+++ b/packages/hmssdk_flutter/example/android/app/build.gradle
@@ -36,8 +36,8 @@ android {
         applicationId "live.hms.flutter"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 516
-        versionName "1.5.216"
+        versionCode 517
+        versionName "1.5.217"
     }
 
     signingConfigs {
diff --git a/packages/hmssdk_flutter/example/ios/Runner/Info.plist b/packages/hmssdk_flutter/example/ios/Runner/Info.plist
index 9e9fc85b5..0d0587ce8 100644
--- a/packages/hmssdk_flutter/example/ios/Runner/Info.plist
+++ b/packages/hmssdk_flutter/example/ios/Runner/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.216</string>
+	<string>1.5.217</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -48,7 +48,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>516</string>
+	<string>517</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>