diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml
index 4bb865c13..facf26fbf 100644
--- a/roles/calibre/tasks/main.yml
+++ b/roles/calibre/tasks/main.yml
@@ -11,19 +11,22 @@
   when: is_rpi
   #when: is_rpi or is_debian    #is_debian apparently also covers is_rpi
 
-# 2. STOP CALIBRE SERVICE IF IT EXISTS (REQUIRED FOR DATABASE ACTIVITY...AND IF not calibre_enabled)
+# 2. STOP CALIBRE SERVICE IF IT EXISTS (REQUIRED FOR DB ACTIVITY...AND IF not calibre_enabled)
 
-- name: Check if Calibre systemd service exists
-  stat:
-    path: /etc/systemd/system/calibre-serve.service
-  register: calibre_svc
+#- name: Check if Calibre systemd service exists
+#  stat:
+#    path: /etc/systemd/system/calibre-serve.service
+#  register: calibre_svc
 
-- name: Disable Calibre service -- stops calibre-server by Kovid Goyal
+- name: Stop Calibre service -- calibre-server by Kovid Goyal
+# systemd:
   service:
     name: calibre-serve
-    #enabled: no
     state: stopped
-  when: calibre_svc.stat.exists
+    #enabled: no
+# register: command_result    # gist.github.com/tyrells/0a79681de339237cb04c
+  failed_when: false          # Never Fail during "systemctl stop calibre-serve" (even if service doesn't exist!)
+# when: calibre_svc.stat.exists
 
 # 3. CREATE DATABASE WITH A SAMPLE BOOK (REQUIRED AS OF CALIBRE 3.x)