diff --git a/app/Http/Controllers/Api/TransactionController.php b/app/Http/Controllers/Api/TransactionController.php
index 2b3ec7fb..0b3d0640 100644
--- a/app/Http/Controllers/Api/TransactionController.php
+++ b/app/Http/Controllers/Api/TransactionController.php
@@ -21,8 +21,6 @@ class TransactionController extends Controller
 
         if ($request->query('encrypted') === 'true') {
             $query->where(fn ($q) => $q->whereNotNull('description_iv')->orWhereNotNull('notes_iv'));
-        } elseif ($request->query('encrypted') === 'false') {
-            $query->whereNull('description_iv')->whereNull('notes_iv');
         }
 
         $transactions = $query->simplePaginate(100);
diff --git a/app/Http/Controllers/EncryptionController.php b/app/Http/Controllers/EncryptionController.php
index 311aedb7..0da92b28 100644
--- a/app/Http/Controllers/EncryptionController.php
+++ b/app/Http/Controllers/EncryptionController.php
@@ -2,34 +2,11 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Requests\SetupEncryptionRequest;
-use App\Models\EncryptedMessage;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 class EncryptionController extends Controller
 {
-    public function setup(SetupEncryptionRequest $request): JsonResponse
-    {
-        $user = $request->user();
-
-        $user->update([
-            'encryption_salt' => $request->validated('salt'),
-        ]);
-
-        EncryptedMessage::query()->updateOrCreate(
-            ['user_id' => $user->id],
-            [
-                'encrypted_content' => $request->validated('encrypted_content'),
-                'iv' => $request->validated('iv'),
-            ]
-        );
-
-        return response()->json([
-            'message' => 'Encryption setup completed successfully',
-        ]);
-    }
-
     public function getMessage(Request $request): JsonResponse
     {
         $user = $request->user();
diff --git a/app/Http/Requests/SetupEncryptionRequest.php b/app/Http/Requests/SetupEncryptionRequest.php
deleted file mode 100644
index ca985f08..00000000
--- a/app/Http/Requests/SetupEncryptionRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Contracts\Validation\ValidationRule;
-use Illuminate\Foundation\Http\FormRequest;
-
-class SetupEncryptionRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     */
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, ValidationRule|array<mixed>|string>
-     */
-    public function rules(): array
-    {
-        return [
-            'salt' => ['required', 'string', 'size:24'],
-            'encrypted_content' => ['required', 'string'],
-            'iv' => ['required', 'string', 'size:16'],
-        ];
-    }
-}
diff --git a/routes/api.php b/routes/api.php
index 9e100920..5f9bca04 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -14,8 +14,7 @@ use App\Http\Controllers\Sync\TransactionSyncController;
 use Illuminate\Support\Facades\Route;
 
 Route::middleware(['web', 'auth'])->group(function () {
-    // Encryption
-    Route::post('encryption/setup', [EncryptionController::class, 'setup']);
+    // Encryption (legacy decrypt-migration support only)
     Route::get('encryption/message', [EncryptionController::class, 'getMessage']);
 
     // Import Data (for import drawers)
diff --git a/tests/Feature/DecryptTransactionsTest.php b/tests/Feature/DecryptTransactionsTest.php
index a4045f8f..875ab477 100644
--- a/tests/Feature/DecryptTransactionsTest.php
+++ b/tests/Feature/DecryptTransactionsTest.php
@@ -27,23 +27,6 @@ test('encrypted transactions endpoint returns only encrypted transactions', func
     expect($data[0]['id'])->toBe($encrypted->id);
 });
 
-test('plaintext filter returns only plaintext transactions', function () {
-    Transaction::factory()->create([
-        'user_id' => $this->user->id,
-        'description_iv' => 'some-iv',
-    ]);
-    $plaintext = Transaction::factory()->plaintext()->create([
-        'user_id' => $this->user->id,
-    ]);
-
-    $response = $this->getJson('/api/transactions?encrypted=false');
-
-    $response->assertOk();
-    $data = $response->json('data');
-    expect($data)->toHaveCount(1);
-    expect($data[0]['id'])->toBe($plaintext->id);
-});
-
 test('encrypted transactions endpoint paginates correctly', function () {
     $account = Account::factory()->create(['user_id' => $this->user->id]);
     $category = Category::factory()->create(['user_id' => $this->user->id]);
diff --git a/tests/Feature/EncryptionTest.php b/tests/Feature/EncryptionTest.php
index e17d77a3..ab1818fc 100644
--- a/tests/Feature/EncryptionTest.php
+++ b/tests/Feature/EncryptionTest.php
@@ -4,7 +4,6 @@ use App\Models\EncryptedMessage;
 use App\Models\User;
 
 use function Pest\Laravel\actingAs;
-use function Pest\Laravel\assertDatabaseHas;
 
 test('authenticated user without encryption salt can access setup page', function () {
     $user = User::factory()->create(['encryption_salt' => null]);
@@ -14,54 +13,6 @@ test('authenticated user without encryption salt can access setup page', functio
     $response->assertSuccessful();
 });
 
-test('user can setup encryption', function () {
-    $user = User::factory()->create(['encryption_salt' => null]);
-
-    $response = actingAs($user)->postJson('/api/encryption/setup', [
-        'salt' => str_repeat('a', 24),
-        'encrypted_content' => 'encrypted_test_content',
-        'iv' => str_repeat('b', 16),
-    ]);
-
-    $response->assertSuccessful();
-
-    $user->refresh();
-
-    expect($user->encryption_salt)->toBe(str_repeat('a', 24));
-
-    assertDatabaseHas('encrypted_messages', [
-        'user_id' => $user->id,
-        'encrypted_content' => 'encrypted_test_content',
-        'iv' => str_repeat('b', 16),
-    ]);
-});
-
-test('encryption setup requires valid salt', function () {
-    $user = User::factory()->create(['encryption_salt' => null]);
-
-    $response = actingAs($user)->postJson('/api/encryption/setup', [
-        'salt' => 'invalid',
-        'encrypted_content' => 'encrypted_test_content',
-        'iv' => str_repeat('b', 16),
-    ]);
-
-    $response->assertUnprocessable();
-    $response->assertJsonValidationErrors(['salt']);
-});
-
-test('encryption setup requires valid iv', function () {
-    $user = User::factory()->create(['encryption_salt' => null]);
-
-    $response = actingAs($user)->postJson('/api/encryption/setup', [
-        'salt' => str_repeat('a', 24),
-        'encrypted_content' => 'encrypted_test_content',
-        'iv' => 'invalid',
-    ]);
-
-    $response->assertUnprocessable();
-    $response->assertJsonValidationErrors(['iv']);
-});
-
 test('user can retrieve encrypted message', function () {
     $user = User::factory()->create([
         'encryption_salt' => str_repeat('a', 24),