diff --git a/webapp/includes/app.js b/webapp/includes/app.js
index fff5ac6..69b365d 100644
--- a/webapp/includes/app.js
+++ b/webapp/includes/app.js
@@ -417,9 +417,11 @@ function renderAuditLog(entries, pagination) {
 
 // Load shortnames for logo dropdown
 async function loadShortnames() {
+    const select = document.getElementById('logoShortName');
+    if (!select) return;
+
     try {
         const result = await api('shortnames_list');
-        const select = document.getElementById('logoShortName');
 
         // Keep first option
         select.innerHTML = '<option value="">Select or type a shortname...</option>';
@@ -469,6 +471,8 @@ async function loadShortnamesGrid() {
 // Load logos grid
 async function loadLogosGrid() {
     const grid = document.getElementById('logoGrid');
+    if (!grid) return;
+
     try {
         const result = await api('logos_list');