diff --git a/packages/hms_room_kit/lib/src/preview/preview_store.dart b/packages/hms_room_kit/lib/src/preview/preview_store.dart
index 970acf6ba..2e7a2c4c9 100644
--- a/packages/hms_room_kit/lib/src/preview/preview_store.dart
+++ b/packages/hms_room_kit/lib/src/preview/preview_store.dart
@@ -144,7 +144,7 @@ class PreviewStore extends ChangeNotifier
           //the HMSConfig for external usage
           endPoint: initEndPoint);
       dynamic value = await hmsSDKInteractor.getRoomLayout(
-          authToken: tokenData, endPoint: layoutAPIEndPoint);
+          authToken: tokenData, endPoint: getLayoutAPIEndpoint());
       log(value.toString());
       hmsSDKInteractor.startHMSLogger(
           Constant.webRTCLogLevel, Constant.sdkLogLevel);
diff --git a/packages/hms_room_kit/lib/src/service/app_debug_config.dart b/packages/hms_room_kit/lib/src/service/app_debug_config.dart
index 0c6ba7f83..dc448232a 100644
--- a/packages/hms_room_kit/lib/src/service/app_debug_config.dart
+++ b/packages/hms_room_kit/lib/src/service/app_debug_config.dart
@@ -16,7 +16,7 @@ class AppDebugConfig {
 
   static bool isDebugMode = false;
   static bool isStreamingFlow = true;
-  static bool isMockLayoutAPI = true;
+  static bool isMockLayoutAPIEnabled = true;
 
   static HMSIOSScreenshareConfig? iOSScreenshareConfig;
 
@@ -30,6 +30,6 @@ class AppDebugConfig {
     isAudioMixerDisabled = true;
     isAutoSimulcast = true;
     isStreamingFlow = true;
-    isMockLayoutAPI = true;
+    isMockLayoutAPIEnabled = true;
   }
 }
diff --git a/packages/hms_room_kit/lib/src/widgets/common_widgets/audio_tile.dart b/packages/hms_room_kit/lib/src/widgets/common_widgets/audio_tile.dart
index 2924eeb44..7103cc7a4 100644
--- a/packages/hms_room_kit/lib/src/widgets/common_widgets/audio_tile.dart
+++ b/packages/hms_room_kit/lib/src/widgets/common_widgets/audio_tile.dart
@@ -47,13 +47,13 @@ class AudioTile extends StatelessWidget {
                 decoration: BoxDecoration(
                     color: const Color.fromRGBO(0, 0, 0, 0.9),
                     borderRadius: BorderRadius.circular(8)),
-                child: const Center(
+                child: Center(
                   child: Padding(
-                    padding: EdgeInsets.all(4),
+                    padding: const EdgeInsets.all(4),
                     child: Row(
                       crossAxisAlignment: CrossAxisAlignment.center,
                       mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
+                      children: const [
                         NetworkIconWidget(),
                         PeerName(),
                       ],
diff --git a/packages/hms_room_kit/lib/src/widgets/common_widgets/peer_tile.dart b/packages/hms_room_kit/lib/src/widgets/common_widgets/peer_tile.dart
index 4b37295f8..7bd303293 100644
--- a/packages/hms_room_kit/lib/src/widgets/common_widgets/peer_tile.dart
+++ b/packages/hms_room_kit/lib/src/widgets/common_widgets/peer_tile.dart
@@ -115,14 +115,14 @@ class _PeerTileState extends State<PeerTile> {
                             decoration: BoxDecoration(
                                 color: transparentBackgroundColor,
                                 borderRadius: BorderRadius.circular(8)),
-                            child: const Center(
+                            child:  Center(
                               child: Padding(
-                                padding: EdgeInsets.only(
+                                padding: const EdgeInsets.only(
                                     left: 8.0, right: 4, top: 4, bottom: 4),
                                 child: Row(
                                   crossAxisAlignment: CrossAxisAlignment.center,
                                   mainAxisAlignment: MainAxisAlignment.center,
-                                  children: [
+                                  children: const [
                                     NetworkIconWidget(),
                                     PeerName(),
                                     DegradeText()
diff --git a/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart b/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart
index 7374d505e..5c90f555d 100644
--- a/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart
+++ b/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart
@@ -29,6 +29,7 @@ class _AppSettingsBottomSheetState extends State<AppSettingsBottomSheet> {
   bool isDebugMode = false;
   HMSAudioMode currentAudioMode = HMSAudioMode.VOICE;
   bool isStreamingFlow = true;
+  bool isMockLayoutAPIEnabled = true;
 
   var versions = {};
 
@@ -73,6 +74,9 @@ class _AppSettingsBottomSheetState extends State<AppSettingsBottomSheet> {
     isStreamingFlow =
         await Utilities.getBoolData(key: 'is_streaming_flow') ?? true;
 
+    isMockLayoutAPIEnabled =
+        await Utilities.getBoolData(key: 'is_mock_layout_api_enabled') ?? true;
+
     WidgetsBinding.instance.addPostFrameCallback((_) {
       setState(() {});
     });
@@ -91,6 +95,7 @@ class _AppSettingsBottomSheetState extends State<AppSettingsBottomSheet> {
     AppDebugConfig.skipPreview = skipPreview;
     AppDebugConfig.isDebugMode = isDebugMode;
     AppDebugConfig.isStreamingFlow = isStreamingFlow;
+    AppDebugConfig.isMockLayoutAPIEnabled = isMockLayoutAPIEnabled;
   }
 
   Future<void> _launchUrl() async {
@@ -252,6 +257,37 @@ class _AppSettingsBottomSheetState extends State<AppSettingsBottomSheet> {
                               setState(() {})
                             }),
                   ),
+                  ListTile(
+                    horizontalTitleGap: 2,
+                    enabled: false,
+                    contentPadding: EdgeInsets.zero,
+                    leading: SvgPicture.asset(
+                      "packages/hms_room_kit/lib/src/assets/icons/screen_share.svg",
+                      fit: BoxFit.scaleDown,
+                      colorFilter:
+                          ColorFilter.mode(themeDefaultColor, BlendMode.srcIn),
+                    ),
+                    title: Text(
+                      "Enable Mock Layout API",
+                      semanticsLabel: "fl_enable_mock_layout_api",
+                      style: GoogleFonts.inter(
+                          fontSize: 14,
+                          color: themeDefaultColor,
+                          letterSpacing: 0.25,
+                          fontWeight: FontWeight.w600),
+                    ),
+                    trailing: CupertinoSwitch(
+                        activeColor: hmsdefaultColor,
+                        value: isMockLayoutAPIEnabled,
+                        onChanged: (value) => {
+                              isMockLayoutAPIEnabled = value,
+                              Utilities.saveBoolData(
+                                  key: 'is_mock_layout_api_enabled',
+                                  value: value),
+                              AppDebugConfig.isMockLayoutAPIEnabled = value,
+                              setState(() {})
+                            }),
+                  ),
                   ListTile(
                     horizontalTitleGap: 2,
                     enabled: false,