diff --git a/debian/postinst b/debian/postinst
index 238817cd7..b8a07442f 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -27,7 +27,7 @@ do_configure() {
         yunohost tools migrations run --auto
 
         echo "Re-diagnosing server health..."
-        yunohost diagnosis run --force
+        [[ -n "${YNH_SKIP_DIAGNOSIS_DURING_UPGRADE:-}" ]] && echo "(Skipping)" || yunohost diagnosis run --force
 
         echo "Refreshing app catalog..."
         yunohost tools update apps --output-as none || true