diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab
index 0860d2a8693fe6bb802cc31d7b950e97ee25471c..882f0386046f2772e63d92e933be9e0268b08c78 100644
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -53,5 +53,7 @@ server {
 
     proxy_pass http://gitlab;
   }
+
+  error_page 502 /502.html;
 }
 
diff --git a/public/502.html b/public/502.html
new file mode 100644
index 0000000000000000000000000000000000000000..d22816ce87015c6ed2f3109617b55d5b11d3db71
--- /dev/null
+++ b/public/502.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>GitLab is not responding (502)</title>
+  <link href="/static.css" media="screen" rel="stylesheet" type="text/css" />
+</head>
+<body>
+  <h1>502</h1>
+  <h3>GitLab is not responding.</h3>
+  <hr/>
+  <p>Please contact your administrator if this problem persists.</p>
+</body>
+</html>