diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml
index 35d86a8ad..17fbe71dc 100644
--- a/roles/calibre/tasks/main.yml
+++ b/roles/calibre/tasks/main.yml
@@ -33,6 +33,7 @@
   with_items:
     - { src: 'calibre-serve.service.j2', dest: '/etc/systemd/system/calibre-serve.service', mode: '0644'}
     - { src: 'calibre.conf', dest: '/etc/{{ apache_config_dir }}', mode: '0644'}
+  when: calibre_enabled
 
 # http://box:8080 & http://box:8080/mobile WORK BUT OTHER URL'S LIKE http://box/books ARE A MESS (BOOKS RARELY DISPLAY)
 - name: Create calibre.conf link for UNTESTED http://box/books etc (debuntu)
@@ -40,7 +41,7 @@
     src: /etc/apache2/sites-available/calibre.conf
     dest: /etc/apache2/sites-enabled/calibre.conf
     state: link
-  when: is_debuntu
+  when: calibre_enabled and is_debuntu
 
 - name: Enable Calibre service -- runs calibre-server by Kovid Goyal
   service:
@@ -63,7 +64,7 @@
 #           state=stopped
 #  when: not calibre_enabled
 
-- name: Add 'calibre-serve' to service list
+- name: Add 'calibre-serve' to service list at /etc/iiab/iiab.ini
   ini_file:
     dest: "{{ service_filelist }}"
     section: calibre