diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5522603c365375d14542f088b785612675e1143..100c79d301182c25db37e69771a52fb03ca3bda0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,3 +7,4 @@
 * Show correct number of visible objects when searching for objects #28
 ### Internal
 * Use a central repository for the buckets and current user permissions to simplify complex interactions between components #29
+* Add healthcheck to docker container 
diff --git a/Dockerfile b/Dockerfile
index 68d154006fe6e184396d3eb6712f09f874fb4d12..3b4ab9dc348033051ecc250c25cc4d17d5f6c94c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,7 @@ RUN npm run build-only
 
 # production stage
 FROM nginx:stable-alpine as production-stage
+HEALTHCHECK --interval=35s --timeout=4s CMD curl -f http://localhost || exit 1
 COPY --from=build-stage /app/dist /usr/share/nginx/html
 COPY nginx.conf /etc/nginx/conf.d/default.conf
 EXPOSE 80