diff --git a/internal/database/database_test.go b/internal/database/database_test.go
index 03b7c96..5a9d303 100644
--- a/internal/database/database_test.go
+++ b/internal/database/database_test.go
@@ -12,7 +12,7 @@ func TestRunMigrationsCreatesHotPathIndexes(t *testing.T) {
 	if err != nil {
 		t.Fatalf("open sqlite: %v", err)
 	}
-	defer sqlDB.Close()
+	defer func() { _ = sqlDB.Close() }()
 	sqlDB.SetMaxOpenConns(1)
 
 	if err := RunMigrations(sqlDB); err != nil {
diff --git a/internal/db/command_palette.go b/internal/db/command_palette.go
index 4422e6b..1f47315 100644
--- a/internal/db/command_palette.go
+++ b/internal/db/command_palette.go
@@ -41,10 +41,10 @@ WHERE c.user_id = ?
   )
 ORDER BY c.updated_at DESC
 LIMIT ?`, userID, needle, pattern, pattern, pattern, pattern, limit)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
+		if err != nil {
+			return nil, err
+		}
+		defer func() { _ = rows.Close() }()
 
 	items := make([]GetContinueWatchingEntriesRow, 0, int(limit))
 	for rows.Next() {
@@ -119,10 +119,10 @@ ORDER BY
   END,
   e.updated_at DESC
 LIMIT ?`, userID, needle, pattern, pattern, pattern, pattern, limit)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
+		if err != nil {
+			return nil, err
+		}
+		defer func() { _ = rows.Close() }()
 
 	items := make([]GetUserWatchListRow, 0, int(limit))
 	for rows.Next() {
diff --git a/internal/db/watchlist_ids.go b/internal/db/watchlist_ids.go
index 3145881..770bc6a 100644
--- a/internal/db/watchlist_ids.go
+++ b/internal/db/watchlist_ids.go
@@ -24,7 +24,7 @@ func (q *Queries) GetUserWatchlistAnimeIDs(ctx context.Context, userID string, a
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 
 	matches := make([]int64, 0, len(animeIDs))
 	for rows.Next() {
diff --git a/internal/db/watchlist_ids_test.go b/internal/db/watchlist_ids_test.go
index 06ce863..2926e07 100644
--- a/internal/db/watchlist_ids_test.go
+++ b/internal/db/watchlist_ids_test.go
@@ -14,7 +14,7 @@ func TestGetUserWatchlistAnimeIDsFiltersRequestedIDs(t *testing.T) {
 	if err != nil {
 		t.Fatalf("open sqlite: %v", err)
 	}
-	defer sqlDB.Close()
+	defer func() { _ = sqlDB.Close() }()
 
 	_, err = sqlDB.Exec(`
 		CREATE TABLE watch_list_entry (