diff --git a/templates/nginx.default.conf.j2 b/templates/nginx.default.conf.j2
index 44bdd19..ba11658 100644
--- a/templates/nginx.default.conf.j2
+++ b/templates/nginx.default.conf.j2
@@ -4,6 +4,13 @@ js_var $pep_credentials;
 js_var $remote_user_js;
 underscores_in_headers on;
 
+{% if inception_project_websockets_enabled == 'true' %}
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    ''      close;
+}
+{% endif %}
+
 upstream _inception-server {
   ip_hash;
   server {{ inception_project_docker_service_name }}:{{ inception_project_server_port }};