diff --git a/root/defaults/nginx.conf b/root/defaults/nginx.conf
index dddb9fe..a444206 100644
--- a/root/defaults/nginx.conf
+++ b/root/defaults/nginx.conf
@@ -23,7 +23,7 @@ http {
 	types_hash_max_size 2048;
 	variables_hash_max_size 2048;
 	large_client_header_buffers 4 16k;
-	
+
 	# server_tokens off;
 
 	# server_names_hash_bucket_size 64;
@@ -72,6 +72,14 @@ http {
 	#passenger_root /usr;
 	#passenger_ruby /usr/bin/ruby;
 
+	##
+	# WebSocket proxying
+	##
+    map $http_upgrade $connection_upgrade {
+        default upgrade;
+        ''      close;
+    }
+
 	##
 	# Virtual Host Configs
 	##
diff --git a/root/defaults/proxy.conf b/root/defaults/proxy.conf
index 12d89e5..1542de2 100644
--- a/root/defaults/proxy.conf
+++ b/root/defaults/proxy.conf
@@ -23,7 +23,8 @@ proxy_set_header X-Forwarded-Host $host;
 proxy_set_header X-Forwarded-Ssl on;
 proxy_redirect  http://  $scheme://;
 proxy_http_version 1.1;
-proxy_set_header Connection "";
+proxy_set_header Upgrade $http_upgrade;
+proxy_set_header Connection $connection_upgrade;
 #proxy_cookie_path / "/; HTTPOnly; Secure"; # enable at your own risk, may break certain apps
 proxy_cache_bypass $cookie_session;
 proxy_no_cache $cookie_session;