diff --git a/HrynCo.NotificationService.DAL.EF/Repositories/EmailChannelRepository.cs b/HrynCo.NotificationService.DAL.EF/Repositories/EmailChannelRepository.cs
index 840bd74..bba5a2d 100644
--- a/HrynCo.NotificationService.DAL.EF/Repositories/EmailChannelRepository.cs
+++ b/HrynCo.NotificationService.DAL.EF/Repositories/EmailChannelRepository.cs
@@ -16,6 +16,7 @@ internal sealed class EmailChannelRepository : EfRepository<EmailChannelEntity>,
     public async Task<IReadOnlyList<EmailChannel>> GetAllAsync(CancellationToken ct = default)
     {
         var entities = await DbSet
+            .AsNoTracking()
             .OrderBy(x => x.ServiceName)
             .ThenBy(x => x.Priority)
             .ToListAsync(ct);
@@ -26,6 +27,7 @@ internal sealed class EmailChannelRepository : EfRepository<EmailChannelEntity>,
     public async Task<IReadOnlyList<EmailChannel>> GetByServiceAsync(string serviceName, CancellationToken ct = default)
     {
         var entities = await DbSet
+            .AsNoTracking()
             .Where(x => x.ServiceName == serviceName)
             .OrderBy(x => x.Priority)
             .ToListAsync(ct);
@@ -35,7 +37,7 @@ internal sealed class EmailChannelRepository : EfRepository<EmailChannelEntity>,
 
     public async Task<EmailChannel?> GetByIdAsync(Guid id, CancellationToken ct = default)
     {
-        EmailChannelEntity? entity = await DbSet.FindAsync([id], ct);
+        EmailChannelEntity? entity = await DbSet.AsNoTracking().FirstOrDefaultAsync(x => x.Id == id, ct);
         return entity is null ? null : MapToDomain(entity);
     }
 
diff --git a/HrynCo.NotificationService.Web/Views/AdminChannels/Edit.cshtml b/HrynCo.NotificationService.Web/Views/AdminChannels/Edit.cshtml
index 7beb11c..6c76202 100644
--- a/HrynCo.NotificationService.Web/Views/AdminChannels/Edit.cshtml
+++ b/HrynCo.NotificationService.Web/Views/AdminChannels/Edit.cshtml
@@ -123,7 +123,7 @@
         </button>
         @if (!Model.IsNew)
         {
-            <button type="button" class="btn btn-success" data-bs-toggle="modal" data-bs-target="#testModal">
+            <button type="button" class="btn btn-success" onclick="new bootstrap.Modal(document.getElementById('testModal')).show()">
                 <i class="bi bi-send me-1"></i> Test
             </button>
         }
@@ -135,62 +135,64 @@
 
 @if (!Model.IsNew)
 {
-    <div class="modal fade" id="testModal" tabindex="-1">
-        <div class="modal-dialog modal-dialog-centered">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title"><i class="bi bi-send me-2"></i>Send Test Email</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                </div>
-                <div class="modal-body">
-                    <label for="testToEmail" class="form-label fw-semibold">Recipient Email</label>
-                    <input type="email" id="testToEmail" class="form-control" placeholder="you@example.com" />
-                    <div id="testResult" class="mt-3" style="display:none"></div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-                    <button type="button" class="btn btn-success" id="testSendBtn" onclick="sendTestEmail('@Model.Id')">
-                        <i class="bi bi-send me-1"></i> Send
-                    </button>
+    @section Scripts {
+        <div class="modal fade" id="testModal" tabindex="-1">
+            <div class="modal-dialog modal-dialog-centered">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title"><i class="bi bi-send me-2"></i>Send Test Email</h5>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+                    </div>
+                    <div class="modal-body">
+                        <label for="testToEmail" class="form-label fw-semibold">Recipient Email</label>
+                        <input type="email" id="testToEmail" class="form-control" placeholder="you@example.com" />
+                        <div id="testResult" class="mt-3" style="display:none"></div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                        <button type="button" class="btn btn-success" id="testSendBtn" onclick="sendTestEmail('@Model.Id')">
+                            <i class="bi bi-send me-1"></i> Send
+                        </button>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
 
-    <script>
-        async function sendTestEmail(channelId) {
-            const toEmail = document.getElementById('testToEmail').value.trim();
-            const resultDiv = document.getElementById('testResult');
-            const sendBtn = document.getElementById('testSendBtn');
+        <script>
+            async function sendTestEmail(channelId) {
+                const toEmail = document.getElementById('testToEmail').value.trim();
+                const resultDiv = document.getElementById('testResult');
+                const sendBtn = document.getElementById('testSendBtn');
 
-            if (!toEmail) {
-                resultDiv.style.display = 'block';
-                resultDiv.innerHTML = '<div class="alert alert-warning mb-0">Please enter a recipient email.</div>';
-                return;
+                if (!toEmail) {
+                    resultDiv.style.display = 'block';
+                    resultDiv.innerHTML = '<div class="alert alert-warning mb-0">Please enter a recipient email.</div>';
+                    return;
+                }
+
+                sendBtn.disabled = true;
+                sendBtn.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span> Sending…';
+                resultDiv.style.display = 'none';
+
+                try {
+                    const resp = await fetch(`/admin/channels/${channelId}/test`, {
+                        method: 'POST',
+                        headers: { 'Content-Type': 'application/json' },
+                        body: JSON.stringify({ toEmail })
+                    });
+                    const data = await resp.json();
+                    resultDiv.style.display = 'block';
+                    resultDiv.innerHTML = data.success
+                        ? `<div class="alert alert-success mb-0"><i class="bi bi-check-circle me-1"></i>${data.message}</div>`
+                        : `<div class="alert alert-danger mb-0"><i class="bi bi-x-circle me-1"></i>${data.message}</div>`;
+                } catch (e) {
+                    resultDiv.style.display = 'block';
+                    resultDiv.innerHTML = `<div class="alert alert-danger mb-0">Request failed: ${e.message}</div>`;
+                } finally {
+                    sendBtn.disabled = false;
+                    sendBtn.innerHTML = '<i class="bi bi-send me-1"></i> Send';
+                }
             }
-
-            sendBtn.disabled = true;
-            sendBtn.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span> Sending…';
-            resultDiv.style.display = 'none';
-
-            try {
-                const resp = await fetch(`/admin/channels/${channelId}/test`, {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ toEmail })
-                });
-                const data = await resp.json();
-                resultDiv.style.display = 'block';
-                resultDiv.innerHTML = data.success
-                    ? `<div class="alert alert-success mb-0"><i class="bi bi-check-circle me-1"></i>${data.message}</div>`
-                    : `<div class="alert alert-danger mb-0"><i class="bi bi-x-circle me-1"></i>${data.message}</div>`;
-            } catch (e) {
-                resultDiv.style.display = 'block';
-                resultDiv.innerHTML = `<div class="alert alert-danger mb-0">Request failed: ${e.message}</div>`;
-            } finally {
-                sendBtn.disabled = false;
-                sendBtn.innerHTML = '<i class="bi bi-send me-1"></i> Send';
-            }
-        }
-    </script>
+        </script>
+    }
 }
diff --git a/HrynCo.NotificationService.Web/Views/Shared/_EditorLayout.cshtml b/HrynCo.NotificationService.Web/Views/Shared/_EditorLayout.cshtml
index 788af8d..908270c 100644
--- a/HrynCo.NotificationService.Web/Views/Shared/_EditorLayout.cshtml
+++ b/HrynCo.NotificationService.Web/Views/Shared/_EditorLayout.cshtml
@@ -14,3 +14,7 @@
         </div>
     </div>
 </div>
+
+@section Scripts {
+    @RenderSection("Scripts", required: false)
+}
diff --git a/HrynCo.NotificationService.Web/Views/Shared/_Layout.cshtml b/HrynCo.NotificationService.Web/Views/Shared/_Layout.cshtml
index 39b28bd..8a20aec 100644
--- a/HrynCo.NotificationService.Web/Views/Shared/_Layout.cshtml
+++ b/HrynCo.NotificationService.Web/Views/Shared/_Layout.cshtml
@@ -51,5 +51,6 @@
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"
             integrity="sha384-YvpcrYf0tY3lHB60NNkmXc4s9bIOgUxi8T/jzmGBE+rYG8O9HP+CyEb1BQGE8B8Z"
             crossorigin="anonymous"></script>
+    @RenderSection("Scripts", required: false)
 </body>
 </html>