diff --git a/core/models.py b/core/models.py
index 575b804e..3ab58e84 100644
--- a/core/models.py
+++ b/core/models.py
@@ -182,7 +182,7 @@ class Timer(models.Model):
     def stop(self, end=None):
         """Stop the timer."""
         if not self.end:
-            self.end = timezone.now()
+            end = timezone.now()
         self.end = end
         self.save()
 
diff --git a/core/templates/core/timer_detail.html b/core/templates/core/timer_detail.html
index 90b5d723..5f48c515 100644
--- a/core/templates/core/timer_detail.html
+++ b/core/templates/core/timer_detail.html
@@ -48,14 +48,16 @@
                    role="button"><i class="fa fa-trash" aria-hidden="true"></i></a>
             {% endif %}
 
-            {% if object.active and perms.core.change_timer %}
+            {% if perms.core.change_timer %}
                 <a class="btn btn-secondary"
                    href="{% url 'timer-restart' timer.id %}"
                    role="button"><i class="fa fa-refresh" aria-hidden="true"></i></a>
 
-                <a class="btn btn-warning"
-                   href="{% url 'timer-stop' timer.id %}"
-                   role="button"><i class="fa fa-stop" aria-hidden="true"></i></a>
+                {% if object.active %}
+                    <a class="btn btn-warning"
+                       href="{% url 'timer-stop' timer.id %}"
+                       role="button"><i class="fa fa-stop" aria-hidden="true"></i></a>
+                {% endif %}
             {% endif %}
 
         </div>