diff --git a/audio/akita/config/audio_policy_configuration.xml b/audio/akita/config/audio_policy_configuration.xml
index 0095733..185b5b3 100644
--- a/audio/akita/config/audio_policy_configuration.xml
+++ b/audio/akita/config/audio_policy_configuration.xml
@@ -36,7 +36,7 @@
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="compressed_offload" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING">
+                         flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD">
                     <profile name="" format="AUDIO_FORMAT_MP3"
                              samplingRates="8000 16000 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
diff --git a/audio/akita/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/akita/config/audio_policy_configuration_a2dp_offload_disabled.xml
index ab5f875..9bf0e21 100644
--- a/audio/akita/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/akita/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -36,7 +36,7 @@
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="compressed_offload" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING">
+                         flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD">
                     <profile name="" format="AUDIO_FORMAT_MP3"
                              samplingRates="8000 16000 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
diff --git a/audio/akita/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/akita/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index f4deda7..77fc384 100644
--- a/audio/akita/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/akita/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -36,7 +36,7 @@
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <!--mixPort name="compressed_offload" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING">
+                         flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD">
                     <profile name="" format="AUDIO_FORMAT_MP3"
                              samplingRates="8000 16000 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
diff --git a/audio/akita/config/audio_policy_configuration_le_offload_disabled.xml b/audio/akita/config/audio_policy_configuration_le_offload_disabled.xml
index e23ff60..bfa8221 100644
--- a/audio/akita/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/akita/config/audio_policy_configuration_le_offload_disabled.xml
@@ -36,7 +36,7 @@
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="compressed_offload" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING">
+                         flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD">
                     <profile name="" format="AUDIO_FORMAT_MP3"
                              samplingRates="8000 16000 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
diff --git a/audio/akita/config/mixer_paths.xml b/audio/akita/config/mixer_paths.xml
index 5dc2626..1d359d5 100644
--- a/audio/akita/config/mixer_paths.xml
+++ b/audio/akita/config/mixer_paths.xml
@@ -31,7 +31,7 @@
     <ctl name="Voice PCM Stream Wait Time in MSec" value="500"/>
 
     <!-- Enable it when AOC is ready to trim delay and padding -->
-    <!--ctl name="Gapless Offload Enable" value="1"/-->
+    <ctl name="Gapless Offload Enable" value="1"/>
 
     <!-- TDM 0 setting -->
     <ctl name="TDM_0_RX Chan" value="Four"/>