diff --git a/docker-compose.yml b/docker-compose.yml
index 1c543e5f..ede543fb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,8 +35,17 @@ services:
     image: ${MEILISEARCH_IMAGE:-getmeili/meilisearch:latest}
     restart: unless-stopped
     profiles: [search]
+    entrypoint:
+      - /bin/sh
+      - -euc
+      - |
+        if [ -z "$${MEILI_MASTER_KEY:-}" ]; then
+          echo "MEILI_MASTER_KEY is required when enabling the search profile" >&2
+          exit 1
+        fi
+        exec /bin/meilisearch
     environment:
-      MEILI_MASTER_KEY: ${MEILI_MASTER_KEY:?Set MEILI_MASTER_KEY in .env - generate one with openssl rand -base64 32}
+      MEILI_MASTER_KEY: ${MEILI_MASTER_KEY:-}
     ports:
       - "${MEILISEARCH_HOST:-127.0.0.1}:${MEILISEARCH_PORT:-7700}:7700"
     volumes: