diff --git a/templates/admin/dashboard.html b/templates/admin/dashboard.html
index 398a360..5dbaf78 100644
--- a/templates/admin/dashboard.html
+++ b/templates/admin/dashboard.html
@@ -164,7 +164,7 @@
           <td>{{ r.email }}</td>
           <td>{{ r.style_genre or '-' }}</td>
           <td><span class="status-badge {{ r.status }}">{{ statuses[r.status] }}</span></td>
-          <td>{% if r.customer_approved != 'none' %}{{ r.customer_approved.upper() }}{% else %}-{% endif %}</td>
+          <td>{% if r.customer_approved and r.customer_approved != 'none' %}{{ (r.customer_approved or 'none').upper() }}{% else %}-{% endif %}</td>
           <td class="actions">
             <a href="{{ url_for('admin_request', rid=r.id) }}">Open</a>
             <form method="POST" action="{{ url_for('admin_delete_request', rid=r.id) }}" style="display:inline" onsubmit="return confirm('ARE YOU SURE you want to delete request #{{ r.id }} for {{ r.name }}? This cannot be undone.')">
diff --git a/templates/admin/request.html b/templates/admin/request.html
index f6bd995..63fe269 100644
--- a/templates/admin/request.html
+++ b/templates/admin/request.html
@@ -348,7 +348,7 @@
             {% if req.customer_approved == 'none' %}
             <span class="approved-box">Nothing yet</span>
             {% else %}
-            <span class="approved-box">{{ req.customer_approved.upper() }}</span>
+            <span class="approved-box">{{ (req.customer_approved or 'none').upper() }}</span>
             {% endif %}
           </p>
           <p>
diff --git a/templates/admin/sales.html b/templates/admin/sales.html
index 6a7b642..5759f4c 100644
--- a/templates/admin/sales.html
+++ b/templates/admin/sales.html
@@ -58,7 +58,7 @@
           <td>#{{ s.id }}</td>
           <td>{{ s.name }}</td>
           <td>{{ s.email }}</td>
-          <td>{% if s.customer_approved == 'both' %}Both Versions{% else %}Version {{ s.customer_approved.upper() }}{% endif %}</td>
+          <td>{% if s.customer_approved == 'both' %}Both Versions{% else %}Version {{ (s.customer_approved or 'none').upper() }}{% endif %}</td>
           <td>{{ s.square_payment_ref or '-' }}</td>
         </tr>
         {% endfor %}
diff --git a/templates/player.html b/templates/player.html
index f616542..78e1c2a 100644
--- a/templates/player.html
+++ b/templates/player.html
@@ -160,7 +160,7 @@
     <!-- Customer already picked a version; show their choice and payment instruction -->
     <div class="locked">
       <h2>✅ Choice Received</h2>
-      <p>You selected:</span> <strong>{% if req.customer_approved == 'both' %}Both Versions{% else %}Version {{ req.customer_approved.upper() }}{% endif %}</strong></p>
+      <p>You selected: <strong>{% if req.customer_approved == 'both' %}Both Versions{% else %}Version {{ (req.customer_approved or 'none').upper() }}{% endif %}</strong></p>
       {% if req.status == 'awaiting_payment' %}
       <p>Please return to the booth to finalize payment and collect your files.</p>
       {% elif req.status == 'paid' %}
diff --git a/templates/status.html b/templates/status.html
index b673a66..0022f67 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -168,8 +168,8 @@
             <h3>Request #{{ req.id }} — {{ req.name }}</h3>
             <p><strong>Status:</strong> <span class="status {{ req.status }}">{{ statuses[req.status] }}</span></p>
 
-            {% if req.customer_approved != 'none' %}
-            <p class="approved">You selected: {% if req.customer_approved == 'both' %}Both Versions{% else %}Version {{ req.customer_approved.upper() }}{% endif %}</p>
+            {% if req.customer_approved and req.customer_approved != 'none' %}
+            <p class="approved">You selected: {% if req.customer_approved == 'both' %}Both Versions{% else %}Version {{ (req.customer_approved or 'none').upper() }}{% endif %}</p>
             {% endif %}
 
             {% if req.song_a_path and req.song_b_path %}