diff --git a/core/ajax/cmd.ajax.php b/core/ajax/cmd.ajax.php
index 031fea216d..573ea4aaed 100644
--- a/core/ajax/cmd.ajax.php
+++ b/core/ajax/cmd.ajax.php
@@ -372,7 +372,7 @@
 			}
 		}
 
-		if (init('allowFuture', 0) == 1 && config::byKey('history::allowFuture', 'core', 0) == '0' && strtotime($dateEnd) > strtotime('now')) {
+		if (init('allowFuture', 0) == 0 && config::byKey('history::allowFuture', 'core', 0) == '0' && strtotime($dateEnd) > strtotime('now')) {
 			$dateEnd = date('Y-m-d H:i:s');
 		}
 
diff --git a/core/js/history.class.js b/core/js/history.class.js
index ecda5f40da..c2e13f438a 100644
--- a/core/js/history.class.js
+++ b/core/js/history.class.js
@@ -210,7 +210,7 @@ jeedom.history.drawChart = function(_params) {
       allowZero: init(_params.option.allowZero, 0),
       groupingType: _params.option.groupingType || '',
       lastPointToEnd: _params.option.lastPointToEnd || 0,
-      allowFuture : _params.option.allowFuture || 0,
+      allowFuture: _params.option.allowFuture || 0,
     },
     dataType: 'json',
     global: _params.global || true,