diff --git a/puppetboard/default_settings.py b/puppetboard/default_settings.py
index 12f9e20..a48bfc7 100644
--- a/puppetboard/default_settings.py
+++ b/puppetboard/default_settings.py
@@ -8,4 +8,5 @@ DEV_LISTEN_HOST = '127.0.0.1'
 DEV_LISTEN_PORT = 5000
 UNRESPONSIVE_HOURS = 2
 ENABLE_QUERY = True
+LOCALISE_TIMESTAMP = True
 LOGLEVEL = 'info'
diff --git a/puppetboard/templates/layout.html b/puppetboard/templates/layout.html
index b7697d4..37d0a04 100644
--- a/puppetboard/templates/layout.html
+++ b/puppetboard/templates/layout.html
@@ -42,9 +42,11 @@
 
     <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/semantic-ui/0.12.0/javascript/semantic.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.5.1/moment.min.js"></script>
+    {% if config.LOCALISE_TIMESTAMP %}
+      <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.5.1/moment.min.js"></script>
+      <script src="{{ url_for('static', filename='js/timestamps.js')}}"></script>
+    {% endif %}
     <script src="//cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.13.3/jquery.tablesorter.min.js"></script>
-    <script src="{{ url_for('static', filename='js/timestamps.js')}}"></script>
     <script src="{{url_for('static', filename='js/lists.js')}}"></script>
     <script src="{{url_for('static', filename='js/tables.js')}}"></script>