diff --git a/roles/metabase/handlers/main.yml b/roles/metabase/handlers/main.yml
index f81ef91..aea684e 100644
--- a/roles/metabase/handlers/main.yml
+++ b/roles/metabase/handlers/main.yml
@@ -2,3 +2,4 @@
 
 - name: restart metabase
   service: name=metabase state=restarted
+  when: not metabase_started.changed
diff --git a/roles/metabase/tasks/services.yml b/roles/metabase/tasks/services.yml
index bbcc30b..159efa3 100644
--- a/roles/metabase/tasks/services.yml
+++ b/roles/metabase/tasks/services.yml
@@ -2,4 +2,5 @@
 
 - name: Start and enable the service
   service: name=metabase state=started enabled=True
+  register: metabase_started
   tags: metabase