diff --git a/helios/templates/election_compute_tally.html b/helios/templates/election_compute_tally.html
index 510b9ae3322b9846adef32ae4d8625810d84a395..c3c1cbd9a5291f26b1b0a15c33e3c5b108f9213a 100644
--- a/helios/templates/election_compute_tally.html
+++ b/helios/templates/election_compute_tally.html
@@ -6,6 +6,7 @@
   <h2 class="title">Compute Tally for Election: {{election.name}}</h2>
 
 <div id="instructions">
+{% if election.num_cast_votes %}
 <p>
     You are about to compute the encrypted tally for election <b>{{election.name}}</b>.
 </p>
@@ -20,6 +21,12 @@
 <input class="pretty" type="submit" value="compute encrypted tally!" />
 <button onclick="document.location='./view'; return false;">never mind</button>
 </form>
+{% else %}
+<p>
+No votes have been cast in this election. At least one vote must be cast before you compute the tally.<br /><br />
+<a href="./view">back to election</a>
+</p>
+{% endif %}
 </div>
 
 <br /><br />