diff --git a/datastore_server/dist/etc/service.properties b/datastore_server/dist/etc/service.properties
index 8b6923932796afa24fa8cd4d4d33fd477f297c51..da76e763781fcfa6c611f8a7677593d9bc188559 100644
--- a/datastore_server/dist/etc/service.properties
+++ b/datastore_server/dist/etc/service.properties
@@ -14,8 +14,8 @@ port = 8444
 # Should the DSS web page be served with SSL encryption?
 use-ssl = true
 # Should Java NIO selector-based sockets be used?
-# (Note: in principle NIO sockets are faster, but on Linux with JRE < 7 they are slower due to a bug)
-use-nio-selector-socket = false
+# Set this to false when running on JRE 1.6 as this version has bugs which make NIO very slow.
+use-nio-selector-socket = true
 
 
 # Session timeout in minutes