diff --git a/customize.dist/application_config.js b/customize.dist/application_config.js
index 8f190a9ad..a91267132 100644
--- a/customize.dist/application_config.js
+++ b/customize.dist/application_config.js
@@ -32,7 +32,10 @@ define(function() {
         '#FF00C0', // hot pink
         '#800080', // purple
     ];
+
     config.enableTemplates = true;
 
+    config.enableHistory = true;
+
     return config;
 });
diff --git a/www/common/common-history.js b/www/common/common-history.js
index c7d250bce..ea1ab152b 100644
--- a/www/common/common-history.js
+++ b/www/common/common-history.js
@@ -12,21 +12,14 @@ define([
     var getStates = function (rt) {
         var states = [];
         var b = rt.getAuthBlock();
-        if (b) { states.unshift(b.getContent().doc); }
+        if (b) { states.unshift(b); }
         while (b.getParent()) {
             b = b.getParent();
-            states.unshift(b.getContent().doc);
+            states.unshift(b);
         }
         return states;
     };
 
-    /* TODO
-     * Implement GET_FULL_HISTORY serverside
-     * All the history messages should be ['FULL_HISTORY', wc.id, msg]
-     * Send [FULL_HISTORY_END, wc.id]
-     *
-     * We also need a chainpad without pruning and with the ability to get old messages
-     */
     var loadHistory = function (common, cb) {
         var network = common.getNetwork();
         var hkn = network.historyKeeper;
@@ -38,7 +31,7 @@ define([
                 userName: 'history',
                 initialState: '',
                 transformFunction: JsonOT.validate,
-                logLevel: 1,
+                logLevel: 0,
                 noPrune: true
             });
         };
@@ -95,12 +88,13 @@ define([
 
         var realtime;
 
-        var states = []; //getStates(rt); //['a', 'b', 'c'];
+        var states = [];
         var c = states.length - 1;
 
         var $hist = $toolbar.find('.cryptpad-toolbar-history');
         var $left = $toolbar.find('.cryptpad-toolbar-leftside');
         var $right = $toolbar.find('.cryptpad-toolbar-rightside');
+        var $cke = $toolbar.find('.cke_toolbox_main');
 
         var onUpdate;
 
@@ -117,7 +111,7 @@ define([
             if (isNaN(i)) { return; }
             if (i < 0) { i = 0; }
             if (i > states.length - 1) { i = states.length - 1; }
-            var val = states[i];
+            var val = states[i].getContent().doc;
             c = i;
             if (typeof onUpdate === "function") { onUpdate(); }
             $hist.find('.next, .previous').show();
@@ -138,6 +132,7 @@ define([
             $hist.html('').show();
             $left.hide();
             $right.hide();
+            $cke.hide();
             var $prev =$('<button>', {
                 'class': 'previous fa fa-step-backward',
                 title: Messages.history_prev
@@ -179,6 +174,7 @@ define([
                 $hist.hide();
                 $left.show();
                 $right.show();
+                $cke.show();
             };
 
             // Buttons actions
@@ -211,7 +207,6 @@ define([
                 });
             });
 
-
             // Display the latest content
             render(get(c));
         };
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index e647e3f40..176d4844f 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -807,6 +807,10 @@ define([
                 });
                 break;
             case 'history':
+                if (!AppConfig.enableHistory) {
+                    button = $('<span>');
+                    break;
+                }
                 button = $('<button>', {
                     title: Messages.historyButton,
                     'class': "fa fa-history",
@@ -816,7 +820,7 @@ define([
                     button.click(function () {
                         common.getHistory(data.histConfig);
                     });
-                };
+                }
                 break;
             default:
                 button = $('<button>', {
diff --git a/www/pad/main.js b/www/pad/main.js
index f7c4d5ede..2d6456e44 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -632,11 +632,7 @@ define([
                 histConfig.onRender = function (val) {
                     if (typeof val === "undefined") { return; }
                     try {
-                        applyHjson(val || '');
-                        /*var hjson = JSON.parse(val || '{}'); // TODO
-                        var remoteDoc = hjson.content;
-                        editor.setValue(remoteDoc || ''); // TODO
-                        editor.save(); // TODO*/
+                        applyHjson(val || '["BODY",{},[]]');
                     } catch (e) {
                         // Probably a parse error
                         console.error(e);