diff --git a/Dockerfile b/Dockerfile
index baa5a2c4..f3fbacc4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -113,4 +113,9 @@ LABEL org.opencontainers.image.title="AnythingMCP" \
 USER appuser
 EXPOSE 3000 4000
 
+# Health check — backend exposes /health on port 4000.
+# 30s interval, 5s timeout, 30s start period, 3 retries before unhealthy.
+HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --retries=3 \
+  CMD wget --quiet --tries=1 --spider http://localhost:4000/health || exit 1
+
 CMD ["./start.sh"]
diff --git a/packages/backend/src/settings/site-settings.controller.ts b/packages/backend/src/settings/site-settings.controller.ts
index 3fff98ec..a638272f 100644
--- a/packages/backend/src/settings/site-settings.controller.ts
+++ b/packages/backend/src/settings/site-settings.controller.ts
@@ -150,7 +150,9 @@ export class SiteSettingsAdminController {
   @Get('footer-links')
   @ApiOperation({ summary: 'Get footer links for current organization (ADMIN)' })
   async getFooterLinks(@Req() req: any) {
-    return this.orgSettings.getFooterLinks(req.user.organizationId) || [];
+    return (
+      (await this.orgSettings.getFooterLinks(req.user.organizationId)) || []
+    );
   }
 
   @Put('footer-links')