diff --git a/frappe/public/js/frappe/socket.js b/frappe/public/js/frappe/socket.js
index 894d50e514..560af7b3e2 100644
--- a/frappe/public/js/frappe/socket.js
+++ b/frappe/public/js/frappe/socket.js
@@ -6,7 +6,13 @@ frappe.socket = {
 			return;
 		}
 
-		frappe.socket.socket = io.connect(frappe.socket.get_host());
+		//Enable secure option when using HTTPS
+		if (window.location.protocol == "https:") {
+   			frappe.socket.socket = io.connect(frappe.socket.get_host(), {secure: true});
+		}
+		else if (window.location.protocol == "http:") {
+			frappe.socket.socket = io.connect(frappe.socket.get_host());
+		}
 
 		if (!frappe.socket.socket) {
 			console.log("Unable to connect to " + frappe.socket.get_host());