diff --git a/debug_scripts/socket_io.html b/debug_scripts/socket_io.html
index 2e9542d..dbd96a9 100644
--- a/debug_scripts/socket_io.html
+++ b/debug_scripts/socket_io.html
@@ -2,7 +2,7 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.3/socket.io.min.js"></script>
 <script>
     // set-up a connection between the client and the server
-    var socket = io.connect('http://ftb-infinity.snipanet.com:8001/');
+    var socket = io.connect('http://ftb-infinity.snipanet.com/');
 
     // let's assume that the client page, once rendered, knows what room it wants to join
     var room = "pool_stats";
diff --git a/deployment/caddyfile b/deployment/caddyfile
index e2331b7..9352fcf 100644
--- a/deployment/caddyfile
+++ b/deployment/caddyfile
@@ -5,8 +5,11 @@
     proxy /api 127.0.0.1:8001 {
         without /api
     }
+    proxy /socket.io 127.0.0.1:8001 {
+        header_upstream Connection {>Connection}
+        header_upstream Upgrade {>Upgrade}
+    }
     header / {
-        Access-Control-Allow-Origin  *
         Access-Control-Allow-Methods "GET, POST, OPTIONS"
         Access-Control-Allow-Headers "Content-Type, x-access-token"
     }
diff --git a/lib/api.js b/lib/api.js
index 391110c..41fb2e9 100644
--- a/lib/api.js
+++ b/lib/api.js
@@ -35,7 +35,7 @@ if(global.config.solo.enable === true){
     pool_list.push('solo');
 }
 
-app.use(cors());
+app.use(cors({origin: true}));
 app.use(bodyParser.urlencoded({extended: false}));
 app.use(bodyParser.json());