diff --git a/app.js b/app.js
index f796852..fce4639 100644
--- a/app.js
+++ b/app.js
@@ -8,6 +8,7 @@ const fs = require('fs');
 const { phoneNumberFormatter } = require('./helpers/formatter');
 const fileUpload = require('express-fileupload');
 const axios = require('axios');
+const port = process.env.PORT || 8000;
 
 const app = express();
 const server = http.createServer(app);
@@ -239,6 +240,6 @@ app.post('/send-group-message', [
   });
 });
 
-server.listen(8000, function() {
-  console.log('App running on *: ' + 8000);
+server.listen(port, function() {
+  console.log('App running on *: ' + port);
 });
diff --git a/index.html b/index.html
index 587065c..4ab95ca 100644
--- a/index.html
+++ b/index.html
@@ -17,7 +17,7 @@
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.3.1/socket.io.min.js" integrity="sha512-/WwtKR6NnHomLo0O4w9QKc1INTPEJs7ko6u2aBTA1paPldhPl8LtXsi7a35iEZ69+9P5dcgVNESG8hrP4Y2t3w==" crossorigin="anonymous"></script>
 	<script>
 		$(document).ready(function() {
-			var socket = io.connect('http://localhost:8000', { path: '/socket.io' });
+			var socket = io();
 
 			socket.on('message', function(msg) {
 				$('.logs').append($('<li>').text(msg));