diff --git a/ct/calibre-web.sh b/ct/calibre-web.sh
index caaace9cb..b1f16b1d0 100644
--- a/ct/calibre-web.sh
+++ b/ct/calibre-web.sh
@@ -57,6 +57,18 @@ function update_script() {
 
     restore_backup
 
+    mkdir -p /opt/calibre-web-library
+    if [[ -f /opt/calibre-web/data/metadata.db && ! -f /opt/calibre-web-library/metadata.db ]]; then
+      msg_info "Migrating Calibre Library to its own directory"
+      find /opt/calibre-web/data -mindepth 1 -maxdepth 1 ! -name app.db ! -name .calibre-web -exec mv -t /opt/calibre-web-library -- {} +
+      msg_ok "Migrated Calibre Library"
+    fi
+    if [[ ! -f /opt/calibre-web-library/metadata.db ]]; then
+      msg_info "Creating Empty Calibre Library"
+      $STD calibredb list --with-library /opt/calibre-web-library
+      msg_ok "Created Empty Calibre Library"
+    fi
+
     msg_info "Starting Service"
     systemctl start calibre-web
     msg_ok "Started Service"
diff --git a/install/calibre-web-install.sh b/install/calibre-web-install.sh
index cf1098e7b..cfb7c0c7f 100644
--- a/install/calibre-web-install.sh
+++ b/install/calibre-web-install.sh
@@ -42,8 +42,14 @@ $STD uv pip install --python /opt/calibre-web/.venv/bin/python --no-cache-dir --
 $STD uv pip install --python /opt/calibre-web/.venv/bin/python --no-cache-dir .
 msg_ok "Installed Python Dependencies"
 
+mkdir -p /opt/calibre-web/data /opt/calibre-web-library
+if [[ ! -f /opt/calibre-web-library/metadata.db ]]; then
+  msg_info "Creating Empty Calibre Library"
+  $STD calibredb list --with-library /opt/calibre-web-library
+  msg_ok "Created Empty Calibre Library"
+fi
+
 msg_info "Creating Service"
-mkdir -p /opt/calibre-web/data
 cat <<EOF >/etc/systemd/system/calibre-web.service
 [Unit]
 Description=Calibre-Web Service