diff --git a/ct/baikal.sh b/ct/baikal.sh
index 74550dd8e..636bb1c36 100644
--- a/ct/baikal.sh
+++ b/ct/baikal.sh
@@ -46,7 +46,7 @@ function update_script() {
 
     msg_info "Configuring Baikal"
     cd /opt/baikal
-    $STD composer install
+    $STD composer install || { msg_warn "composer.lock doesn't match composer.json (known upstream packaging issue) - regenerating"; $STD composer update; }
     msg_ok "Configured Baikal"
 
     msg_info "Starting Service"
diff --git a/install/baikal-install.sh b/install/baikal-install.sh
index 1a39496b4..f151d1c25 100644
--- a/install/baikal-install.sh
+++ b/install/baikal-install.sh
@@ -25,7 +25,7 @@ PG_DB_NAME="baikal_db" PG_DB_USER="baikal_user" PG_DB_PASS="$(openssl rand -base
 
 msg_info "Configuring Baikal"
 cd /opt/baikal
-$STD composer install
+$STD composer install || { msg_warn "composer.lock doesn't match composer.json (known upstream packaging issue) - regenerating"; $STD composer update; }
 cat <<EOF >/opt/baikal/config/baikal.yaml
 database:
     backend: pgsql