diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioPreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioPreferenceController.java
index 25180d8dbc4..655ad24a781 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioPreferenceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioPreferenceController.java
@@ -340,7 +340,9 @@ public class AudioSharingCallAudioPreferenceController extends AudioSharingBaseP
         if (lead != null) {
             String addr = lead.getDevice().getAnonymizedAddress();
             Log.d(TAG, "Set call audio device: " + addr);
-            if (Flags.adoptPrimaryGroupManagementApi() && !mIsAudioModeOngoingCall.get()) {
+            if ((Flags.adoptPrimaryGroupManagementApi() || (Flags.audioSharingDeveloperOption()
+                    && BluetoothUtils.getAudioSharingPreviewValue(mContentResolver)))
+                    && !mIsAudioModeOngoingCall.get()) {
                 LeAudioProfile leaProfile = mBtManager == null ? null
                         : mBtManager.getProfileManager().getLeAudioProfile();
                 if (leaProfile != null) {
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandler.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandler.java
index 655fd970a15..9f4ccda053a 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandler.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandler.java
@@ -227,7 +227,10 @@ public class AudioSharingDialogHandler {
                             mLocalBtManager, groupedDevices, /* filterByInSharing= */ true);
             AudioSharingStopDialogFragment.DialogEventListener listener =
                     () -> {
-                        if (Flags.adoptPrimaryGroupManagementApi() && mLocalBtManager != null) {
+                        if (mLocalBtManager != null && (Flags.adoptPrimaryGroupManagementApi() || (
+                                mContext != null && Flags.audioSharingDeveloperOption()
+                                        && BluetoothUtils.getAudioSharingPreviewValue(
+                                        mContext.getContentResolver())))) {
                             LeAudioProfile profile =
                                     mLocalBtManager.getProfileManager().getLeAudioProfile();
                             if (profile != null) {