diff --git a/orientdb/tasks/main.yml b/orientdb/tasks/main.yml
index f96b686e..95312dc9 100644
--- a/orientdb/tasks/main.yml
+++ b/orientdb/tasks/main.yml
@@ -76,6 +76,10 @@
       service: name=orientdb state=started enabled=yes
       when: orientdb_enabled
 
+    - name: Ensure that the service is stopped and disabled
+      service: name=orientdb state=stopped enabled=no
+      when: not orientdb_enabled
+
   tags: orientdb
   when: orientdb_install