diff --git a/plinth/modules/calibre/data/usr/share/freedombox/etc/apache2/conf-available/calibre-freedombox.conf b/plinth/modules/calibre/data/usr/share/freedombox/etc/apache2/conf-available/calibre-freedombox.conf
index e423f2134..8187c95ed 100644
--- a/plinth/modules/calibre/data/usr/share/freedombox/etc/apache2/conf-available/calibre-freedombox.conf
+++ b/plinth/modules/calibre/data/usr/share/freedombox/etc/apache2/conf-available/calibre-freedombox.conf
@@ -3,8 +3,13 @@
 ##
 <Location /calibre>
     ProxyPass http://localhost:8844/calibre
-    Include includes/freedombox-single-sign-on.conf
-    <IfModule mod_auth_pubtkt.c>
-        TKTAuthToken "admin" "calibre"
-    </IfModule>
+    Use AuthOpenIDConnect
+    Use RequireGroup calibre
+
+    # Calibre has a bug where an empty value for a HTTP header is treated as
+    # invalid. OIDC_CLAIM_email can be empty and this causes Calibre to error
+    # out. So, try to pass all the OpenID Connect user information and claims as
+    # headers that can't have an empty value.
+    OIDCPassIDTokenAs "serialized"
+    OIDCPassUserInfoAs "json"
 </Location>