diff --git a/templates/workspaces/workspace.focus.fish.j2 b/templates/workspaces/workspace.focus.fish.j2
index cdb53c4..4864de0 100644
--- a/templates/workspaces/workspace.focus.fish.j2
+++ b/templates/workspaces/workspace.focus.fish.j2
@@ -3,5 +3,9 @@
 i3-msg mode remote
 
 {% if workspaces[workspace].activity is defined %}
+{% if workspaces[workspace].activity %}
 ~/bin/timer begin_activity "{{workspaces[workspace].activity}}"
+{% else %}
+~/bin/timer end_activity
+{% endif %}
 {% endif %}