diff --git a/consumerWebsite/functions/sensorData.js b/consumerWebsite/functions/sensorData.js
index 9af0f44..37053a6 100644
--- a/consumerWebsite/functions/sensorData.js
+++ b/consumerWebsite/functions/sensorData.js
@@ -1,7 +1,7 @@
 const { Op, Sequelize } = require("sequelize");
 const { sequelize }  = require("../database/mySql.js");
 const { sensorDataModel } = require("../database/model/sensorDataModel.js");
-const socket = require('../functions/socket');
+const io = require('../functions/socket');
 // const { io } = require('../app')
 
 //helper function to convert month name to month number
@@ -27,7 +27,7 @@ async function addSensorData(id_sensor, id_location, sensordata) {
 		measurement: sensordata,
 	});
 
-	socket.emit('sensordata:new', sensorData)
+	io().emit('sensordata:new', sensorData)
 
 	return sensorData;
 }
diff --git a/consumerWebsite/functions/socket.js b/consumerWebsite/functions/socket.js
index ec35667..a1eaa98 100644
--- a/consumerWebsite/functions/socket.js
+++ b/consumerWebsite/functions/socket.js
@@ -1,16 +1,19 @@
 const app = require("../app");
-const socket = {};
+const io = ()=> app.io;
 
+// We have to wait for the express HTTP server to be finished starting before we
+// can use any of the socket.io stuff. 
 app.onListen.push(function(){
-	socket.emit = (topic, data) => app.io.emit(topic, data);
-	
+
 	app.io.on('connection', (socket) => {
 		console.log('User connected via WebsSocket')
+
+		socket.on('disconnect', (socket) => {
+			console.log('User disconnect via WebsSocket')
+		});
 	});
 
-	app.io.on('disconnect', (socket) => {
-		console.log('User disconnect via WebsSocket')
-	});
 });
 
-module.exports = socket;
+
+module.exports = io;