diff --git a/server/app.js b/server/app.js
index a562f80d..611dc126 100644
--- a/server/app.js
+++ b/server/app.js
@@ -78,10 +78,10 @@ function startSingle(clustered, redis_enabled) {
             ca: ca
         };
         var https = require('https');
-        server = require('http2').createServer(credentials, routingFunction);
+        server = https.Server(credentials, routingFunction);
     } catch(err){
         console.log("Starting without https (probably on localhost)");
-        server = require('http2').createServer(routingFunction);
+        server = http.createServer(routingFunction);
     }
 
     if(clustered) {
diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js
index ec61d39c..f29bebfa 100644
--- a/server/public/assets/js/channel.js
+++ b/server/public/assets/js/channel.js
@@ -619,7 +619,7 @@ var Channel = {
 }
 
 function get_history() {
-    if(socket.id) {
+    if(socket && socket.id) {
         var p = Crypt.get_userpass();
         var c = Crypt.crypt_pass(p, true);
         socket.emit("get_history", {channel: chan.toLowerCase(), all: false, pass: embed ? '' : c});