diff --git a/src/renderer/features/player/hooks/use-auto-dj.ts b/src/renderer/features/player/hooks/use-auto-dj.ts
index bd262d2de..cd2d052cb 100644
--- a/src/renderer/features/player/hooks/use-auto-dj.ts
+++ b/src/renderer/features/player/hooks/use-auto-dj.ts
@@ -169,7 +169,7 @@ export const useAutoDJ = () => {
             },
             {
                 equalityFn: (a, b) => {
-                    return a.song?._uniqueId === b.song?._uniqueId;
+                    return a.song?._uniqueId === b.song?._uniqueId && a.remaining === b.remaining;
                 },
             },
         );
diff --git a/src/renderer/features/settings/components/playback/auto-dj-settings.tsx b/src/renderer/features/settings/components/playback/auto-dj-settings.tsx
index 66f34d232..897b6e71b 100644
--- a/src/renderer/features/settings/components/playback/auto-dj-settings.tsx
+++ b/src/renderer/features/settings/components/playback/auto-dj-settings.tsx
@@ -66,7 +66,7 @@ export const AutoDJSettings = () => {
     return (
         <SettingsSection
             options={autoDJOptions}
-            title={t('setting.autoDJ', { postProcess: 'upperCase' })}
+            title={t('setting.autoDJ', { postProcess: 'titleCase' })}
         />
     );
 };