diff --git a/db/migrations/20260405124200_fix_schema_inconsistencies.sql b/db/migrations/20260405124200_fix_schema_inconsistencies.sql
new file mode 100644
index 000000000..15fe95308
--- /dev/null
+++ b/db/migrations/20260405124200_fix_schema_inconsistencies.sql
@@ -0,0 +1,55 @@
+-- +goose Up
+
+-- NOTE: This migration recreates two tables to fix schema inconsistencies.
+-- On large production databases, the data copy may take some time as tables are locked during the transaction.
+-- This is necessary because SQLite does not support altering table constraints directly.
+-- Consider applying this migration during a maintenance window if the tables are large.
+
+-- Fix library_artist table: Remove contradictory 'default null' from 'not null' column
+-- This is a cosmetic fix (NOT NULL takes precedence), but improves schema consistency
+CREATE TABLE library_artist_new
+(
+    library_id integer NOT NULL DEFAULT 1
+        REFERENCES library(id) ON DELETE CASCADE,
+    artist_id varchar NOT NULL
+        REFERENCES artist(id) ON DELETE CASCADE,
+    stats text DEFAULT '{}',
+    CONSTRAINT library_artist_ux UNIQUE (library_id, artist_id)
+);
+
+INSERT INTO library_artist_new (library_id, artist_id, stats)
+SELECT library_id, artist_id, stats FROM library_artist;
+
+DROP TABLE library_artist;
+
+ALTER TABLE library_artist_new RENAME TO library_artist;
+
+-- Fix scrobble_buffer table: Remove duplicate user_id from unique constraint
+-- Original constraint had: UNIQUE (user_id, service, media_file_id, play_time, user_id)
+-- Fixed constraint is: UNIQUE (user_id, service, media_file_id, play_time)
+CREATE TABLE scrobble_buffer_new
+(
+    user_id varchar NOT NULL
+        CONSTRAINT scrobble_buffer_user_id_fk
+            REFERENCES user ON UPDATE CASCADE ON DELETE CASCADE,
+    service varchar NOT NULL,
+    media_file_id varchar NOT NULL
+        CONSTRAINT scrobble_buffer_media_file_id_fk
+            REFERENCES media_file ON UPDATE CASCADE ON DELETE CASCADE,
+    play_time datetime NOT NULL,
+    enqueue_time datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    id varchar NOT NULL DEFAULT '',
+    CONSTRAINT scrobble_buffer_pk UNIQUE (user_id, service, media_file_id, play_time)
+);
+
+INSERT INTO scrobble_buffer_new (user_id, service, media_file_id, play_time, enqueue_time, id)
+SELECT user_id, service, media_file_id, play_time, enqueue_time, id FROM scrobble_buffer;
+
+DROP TABLE scrobble_buffer;
+
+ALTER TABLE scrobble_buffer_new RENAME TO scrobble_buffer;
+
+CREATE UNIQUE INDEX scrobble_buffer_id_ix ON scrobble_buffer (id);
+
+-- +goose Down
+-- Down migration is intentionally a no-op: Navidrome does not run down migrations.