diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Constants.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Constants.kt
index 0c9538f5..0f22d0c4 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Constants.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Constants.kt
@@ -85,7 +85,6 @@ object Constants {
     const val PREFERENCES_KEY_DEFAULT_SONGS = "defaultSongs"
     const val PREFERENCES_KEY_DEFAULT_ARTISTS = "defaultArtists"
     const val PREFERENCES_KEY_SHOW_NOW_PLAYING = "showNowPlaying"
-    const val PREFERENCES_KEY_GAPLESS_PLAYBACK = "gaplessPlayback"
     const val PREFERENCES_KEY_PLAYBACK_CONTROL_SETTINGS = "playbackControlSettings"
     const val PREFERENCES_KEY_CLEAR_SEARCH_HISTORY = "clearSearchHistory"
     const val PREFERENCES_KEY_DOWNLOAD_TRANSITION = "transitionToDownloadOnPlay"
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Settings.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Settings.kt
index 2b29f506..e5a0c4d5 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Settings.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Settings.kt
@@ -140,10 +140,6 @@ object Settings {
     var showNowPlaying
         by BooleanSetting(Constants.PREFERENCES_KEY_SHOW_NOW_PLAYING, true)
 
-    @JvmStatic
-    var gaplessPlayback
-        by BooleanSetting(Constants.PREFERENCES_KEY_GAPLESS_PLAYBACK, false)
-
     @JvmStatic
     var shouldTransitionOnPlayback by BooleanSetting(
         Constants.PREFERENCES_KEY_DOWNLOAD_TRANSITION,
diff --git a/ultrasonic/src/main/res/values-cs/strings.xml b/ultrasonic/src/main/res/values-cs/strings.xml
index b2eb3819..197a16ad 100644
--- a/ultrasonic/src/main/res/values-cs/strings.xml
+++ b/ultrasonic/src/main/res/values-cs/strings.xml
@@ -195,8 +195,6 @@
     <string name="settings.disc_sort_summary">Řadit seznam skladeb dle čísla CD a čísla skladby</string>
     <string name="settings.display_bitrate_summary">Připojovat jméno umělce, bitrate a příponu souboru</string>
     <string name="settings.download_transition_summary">Při spuštění přehrávání přepnout na aktivitu stahování</string>
-    <string name="settings.gapless_playback">Přehrávání bez pauz</string>
-    <string name="settings.gapless_playback_summary">Zapnout přehrávání bez pauz</string>
     <string name="settings.hide_media_summary">Skrýt hudební soubory před ostatními aplikacemi.</string>
     <string name="settings.hide_media_title">Skrýt před ostatními</string>
     <string name="settings.hide_media_toast">Nabyde účinnosti při příštím skenování hudby systému Android.</string>
diff --git a/ultrasonic/src/main/res/values-de/strings.xml b/ultrasonic/src/main/res/values-de/strings.xml
index 3737b57c..7a597eb3 100644
--- a/ultrasonic/src/main/res/values-de/strings.xml
+++ b/ultrasonic/src/main/res/values-de/strings.xml
@@ -210,8 +210,6 @@
     <string name="settings.display_bitrate">Bitrate und Dateiendung anzeigen</string>
     <string name="settings.display_bitrate_summary">Bitrate und Dateityp hinter der Künstler*in anzeigen</string>
     <string name="settings.download_transition_summary">Herunterladen zusammen mit der Wiedergabe starten.</string>
-    <string name="settings.gapless_playback">Lückenlose Wiedergabe</string>
-    <string name="settings.gapless_playback_summary">Lückenlose Wiedergabe aktivieren</string>
     <string name="settings.hide_media_summary">Musikdateien vor anderen Apps verbergen</string>
     <string name="settings.hide_media_title">Vor anderen verbergen</string>
     <string name="settings.hide_media_toast">Wird beim nächsten Durchsuchen nach Musik durch Android wirksam.</string>
diff --git a/ultrasonic/src/main/res/values-es/strings.xml b/ultrasonic/src/main/res/values-es/strings.xml
index f53ea705..80b620cc 100644
--- a/ultrasonic/src/main/res/values-es/strings.xml
+++ b/ultrasonic/src/main/res/values-es/strings.xml
@@ -217,8 +217,6 @@
     <string name="settings.display_bitrate_summary">Añadir el nombre del artista con la tasa de bits y la extensión del archivo</string>
     <string name="settings.download_transition">Mostrar descargas en reproducción</string>
     <string name="settings.download_transition_summary">Mostrar la actividad de descarga cuando comienza la reproducción</string>
-    <string name="settings.gapless_playback">Reproducción sin pausas</string>
-    <string name="settings.gapless_playback_summary">Activa la reproducción sin pausas</string>
     <string name="settings.hide_media_summary">Oculta los archivos de música desde otras aplicaciones.</string>
     <string name="settings.hide_media_title">Ocultar desde otras</string>
     <string name="settings.hide_media_toast">Tiene efecto la próxima vez que Android escanee la música de tu dispositivo.</string>
diff --git a/ultrasonic/src/main/res/values-fr/strings.xml b/ultrasonic/src/main/res/values-fr/strings.xml
index 34b0833e..5bf0ddb3 100644
--- a/ultrasonic/src/main/res/values-fr/strings.xml
+++ b/ultrasonic/src/main/res/values-fr/strings.xml
@@ -212,8 +212,6 @@
     <string name="settings.display_bitrate_summary">Ajouter le nom d\'artiste, bitrate et suffixe du fichier</string>
     <string name="settings.download_transition">Afficher le téléchargement lors de la lecture</string>
     <string name="settings.download_transition_summary">Aller vers les téléchargements lorsque qu\'un titre est écouté</string>
-    <string name="settings.gapless_playback">Lecture sans interruption</string>
-    <string name="settings.gapless_playback_summary">Activer la lecture sans interruption</string>
     <string name="settings.hide_media_summary">Masquer les fichiers musicaux et les couvertures d\'album aux autres applis (Galerie, Musique, etc.)</string>
     <string name="settings.hide_media_title">Masquer aux autres</string>
     <string name="settings.hide_media_toast">Prendra effet la prochaine fois qu\'Android recensera les médias disponibles sur l\'appareil.</string>
diff --git a/ultrasonic/src/main/res/values-hu/strings.xml b/ultrasonic/src/main/res/values-hu/strings.xml
index 888ba13c..a8e758b3 100644
--- a/ultrasonic/src/main/res/values-hu/strings.xml
+++ b/ultrasonic/src/main/res/values-hu/strings.xml
@@ -204,8 +204,6 @@
     <string name="settings.disc_sort_summary">Dalok rendezése albumsorszám és dalsorszám szerint.</string>
     <string name="settings.display_bitrate_summary">Bitráta és fájlkiterjesztés megjelenítése az előadónév mellett.</string>
     <string name="settings.download_transition_summary">Letöltési aktivitás megjelenítése a lejátszás indításakor.</string>
-    <string name="settings.gapless_playback">Egybefüggő lejátszás</string>
-    <string name="settings.gapless_playback_summary">Kihagyás (dalszünet) nélküli egybefüggő lejátszás (Gapless).</string>
     <string name="settings.hide_media_summary">Zenefájlok elrejtése egyéb alkalmazások elől.</string>
     <string name="settings.hide_media_title">Elrejtés</string>
     <string name="settings.hide_media_toast">A következő alkalomtól lép életbe, amikor az Android zenefájlokat keres a telefonon.</string>
diff --git a/ultrasonic/src/main/res/values-it/strings.xml b/ultrasonic/src/main/res/values-it/strings.xml
index 54122b09..fe7c0a1d 100644
--- a/ultrasonic/src/main/res/values-it/strings.xml
+++ b/ultrasonic/src/main/res/values-it/strings.xml
@@ -191,8 +191,6 @@
     <string name="settings.disc_sort_summary">Ordina lista canzoni secondo il numero disco e traccia</string>
     <string name="settings.display_bitrate_summary">Aggiungi nome artista con bitrare ed estensione file</string>
     <string name="settings.download_transition_summary">Passa al download quando inizia riproduzione</string>
-    <string name="settings.gapless_playback">Riproduzione Ininterrotta</string>
-    <string name="settings.gapless_playback_summary">Abilita riproduzione ininterrotta</string>
     <string name="settings.hide_media_summary">Nascondi file musicali di altre app</string>
     <string name="settings.hide_media_title">Nascondi Da Altro</string>
     <string name="settings.hide_media_toast">Effettivo alla prossima scansione Android per file musicali sul telefono.</string>
diff --git a/ultrasonic/src/main/res/values-nl/strings.xml b/ultrasonic/src/main/res/values-nl/strings.xml
index 6d65e679..e358892d 100644
--- a/ultrasonic/src/main/res/values-nl/strings.xml
+++ b/ultrasonic/src/main/res/values-nl/strings.xml
@@ -217,8 +217,6 @@
     <string name="settings.display_bitrate_summary">Bitsnelheid en bestandsextensie toevoegen aan artiestennaam</string>
     <string name="settings.download_transition">Downloads tonen bij afspelen</string>
     <string name="settings.download_transition_summary">Overschakelen naar downloadactiviteit na starten van afspelen</string>
-    <string name="settings.gapless_playback">Naadloze overgang</string>
-    <string name="settings.gapless_playback_summary">Naadloze overgang tussen nummers inschakelen</string>
     <string name="settings.hide_media_summary">Muziekbestanden verbergen voor andere apps.</string>
     <string name="settings.hide_media_title">Verbergen voor andere apps</string>
     <string name="settings.hide_media_toast">Dit wordt toegepast bij de volgende keer dat Android je muziek doorzoekt.</string>
diff --git a/ultrasonic/src/main/res/values-pl/strings.xml b/ultrasonic/src/main/res/values-pl/strings.xml
index 9438ffff..285241f4 100644
--- a/ultrasonic/src/main/res/values-pl/strings.xml
+++ b/ultrasonic/src/main/res/values-pl/strings.xml
@@ -195,8 +195,6 @@
     <string name="settings.disc_sort_summary">Sortuje listę utworów wg numeru dysku i numeru utworu</string>
     <string name="settings.display_bitrate_summary">Dołącza bitrate i typ pliku do nazwy artysty</string>
     <string name="settings.download_transition_summary">Wyświetla postęp pobierania podczas odtwarzania</string>
-    <string name="settings.gapless_playback">Odtwarzanie bez przerw</string>
-    <string name="settings.gapless_playback_summary">Włącz odtwarzanie bez przerw między utworami</string>
     <string name="settings.hide_media_summary">Ukrywa pliki muzyczne przed innymi aplikacjami.</string>
     <string name="settings.hide_media_title">Ukryj pliki</string>
     <string name="settings.hide_media_toast">Efekt widoczny będzie po następnym skanowaniu muzyki przez system Android</string>
diff --git a/ultrasonic/src/main/res/values-pt-rBR/strings.xml b/ultrasonic/src/main/res/values-pt-rBR/strings.xml
index c23a305a..0aaf5b8b 100644
--- a/ultrasonic/src/main/res/values-pt-rBR/strings.xml
+++ b/ultrasonic/src/main/res/values-pt-rBR/strings.xml
@@ -212,8 +212,6 @@
     <string name="settings.display_bitrate_summary">Adicionar o nome do artista com a taxa de bits e sufixo do arquivo</string>
     <string name="settings.download_transition">Mostrar Downloads na Reprodução</string>
     <string name="settings.download_transition_summary">Transição para atividade de download quando iniciar reprodução</string>
-    <string name="settings.gapless_playback">Reprodução sem Interrupção</string>
-    <string name="settings.gapless_playback_summary">Ativar reprodução sem interrupção</string>
     <string name="settings.hide_media_summary">Esconder arquivos de músicas de outros aplicativos</string>
     <string name="settings.hide_media_title">Esconder de Outros</string>
     <string name="settings.hide_media_toast">Será efetivado na próxima vez que o Android procurar por músicas em seu celular.</string>
diff --git a/ultrasonic/src/main/res/values-pt/strings.xml b/ultrasonic/src/main/res/values-pt/strings.xml
index c8da511d..681f7630 100644
--- a/ultrasonic/src/main/res/values-pt/strings.xml
+++ b/ultrasonic/src/main/res/values-pt/strings.xml
@@ -195,8 +195,6 @@
     <string name="settings.disc_sort_summary">Classificar músicas pelo número do álbum e faixas.</string>
     <string name="settings.display_bitrate_summary">Adiciona o nome do artista com a taxa de bits e sufixo do ficheiro</string>
     <string name="settings.download_transition_summary">Transição para atividade de download quando iniciar reprodução</string>
-    <string name="settings.gapless_playback">Reprodução sem Interrupção</string>
-    <string name="settings.gapless_playback_summary">Habilita reprodução sem interrupção</string>
     <string name="settings.hide_media_summary">Esconder músicas de outros aplicativos.</string>
     <string name="settings.hide_media_title">Esconder de Outros</string>
     <string name="settings.hide_media_toast">Será realizado na próxima vez que o Android procurar por músicas em seu telemóvel.</string>
diff --git a/ultrasonic/src/main/res/values-ru/strings.xml b/ultrasonic/src/main/res/values-ru/strings.xml
index 7935cc57..51a3a2bf 100644
--- a/ultrasonic/src/main/res/values-ru/strings.xml
+++ b/ultrasonic/src/main/res/values-ru/strings.xml
@@ -206,8 +206,6 @@
     <string name="settings.disc_sort_summary">Сортировать список песен по номеру диска и треку</string>
     <string name="settings.display_bitrate_summary">Добавить имя исполнителя с битрейтом и суффиксом файла</string>
     <string name="settings.download_transition_summary">Переход к загрузке активности при запуске воспроизведения</string>
-    <string name="settings.gapless_playback">Воспроизведение без промежутка</string>
-    <string name="settings.gapless_playback_summary">Включить воспроизведение без паузы</string>
     <string name="settings.hide_media_summary">Включить воспроизведение без паузы</string>
     <string name="settings.hide_media_title">Скрыть от других</string>
     <string name="settings.hide_media_toast">Вступает в силу в следующий раз, Android сканирует ваш телефон на предмет музыки</string>
diff --git a/ultrasonic/src/main/res/values-zh-rCN/strings.xml b/ultrasonic/src/main/res/values-zh-rCN/strings.xml
index 2877b4d9..bdf1e475 100644
--- a/ultrasonic/src/main/res/values-zh-rCN/strings.xml
+++ b/ultrasonic/src/main/res/values-zh-rCN/strings.xml
@@ -212,8 +212,6 @@
     <string name="settings.disc_sort_summary">按光盘编号和曲目编号对歌曲列表进行排序</string>
     <string name="settings.display_bitrate">展示比特率和文件后缀</string>
     <string name="settings.display_bitrate_summary">在艺术家姓名后追加比特率和文件后缀</string>
-    <string name="settings.gapless_playback">无缝播放</string>
-    <string name="settings.gapless_playback_summary">启用无缝播放</string>
     <string name="settings.hide_media_summary">隐藏来自其他应用的音乐</string>
     <string name="settings.hide_media_title">隐藏其他来源</string>
     <string name="settings.hide_media_toast">在安卓系统下次扫描音乐时生效。</string>
diff --git a/ultrasonic/src/main/res/values/strings.xml b/ultrasonic/src/main/res/values/strings.xml
index 3228ef45..e17ed742 100644
--- a/ultrasonic/src/main/res/values/strings.xml
+++ b/ultrasonic/src/main/res/values/strings.xml
@@ -234,8 +234,6 @@
     <string name="settings.display_bitrate_summary">Append artist name with bitrate and file suffix</string>
     <string name="settings.download_transition">Show Now Playing on Play</string>
     <string name="settings.download_transition_summary">Switch to Now Playing after starting playback in media view</string>
-    <string name="settings.gapless_playback">Gapless Playback</string>
-    <string name="settings.gapless_playback_summary">Enable gapless playback</string>
     <string name="settings.hide_media_summary">Hide music files from other apps.</string>
     <string name="settings.hide_media_title">Hide From Other</string>
     <string name="settings.hide_media_toast">Takes effect next time Android scans your phone for music.</string>
diff --git a/ultrasonic/src/main/res/xml/settings.xml b/ultrasonic/src/main/res/xml/settings.xml
index 99c9fc0a..8872733b 100644
--- a/ultrasonic/src/main/res/xml/settings.xml
+++ b/ultrasonic/src/main/res/xml/settings.xml
@@ -77,12 +77,6 @@
             a:summary="@string/settings.download_transition_summary"
             a:title="@string/settings.download_transition"
             app:iconSpaceReserved="false"/>
-        <CheckBoxPreference
-            a:defaultValue="false"
-            a:key="gaplessPlayback"
-            a:summary="@string/settings.gapless_playback_summary"
-            a:title="@string/settings.gapless_playback"
-            app:iconSpaceReserved="false"/>
         <CheckBoxPreference
             a:defaultValue="false"
             a:key="clearPlaylist"