diff --git a/socketserver/server/handlecore.go b/socketserver/server/handlecore.go
index d502d071..9fbb1af7 100644
--- a/socketserver/server/handlecore.go
+++ b/socketserver/server/handlecore.go
@@ -96,7 +96,9 @@ func SetupServerAndHandle(config *ConfigFile, serveMux *http.ServeMux) {
 		resp.Body.Close()
 	}
 
-	logstasher.Setup(Configuration.ESServer, Configuration.ESIndexPrefix, Configuration.ESHostName)
+	if Configuration.UseESLogStashing {
+		logstasher.Setup(Configuration.ESServer, Configuration.ESIndexPrefix, Configuration.ESHostName)
+	}
 
 	go authorizationJanitor()
 	go bunchCacheJanitor()
diff --git a/socketserver/server/types.go b/socketserver/server/types.go
index fe6193ba..6d7c68a9 100644
--- a/socketserver/server/types.go
+++ b/socketserver/server/types.go
@@ -31,7 +31,7 @@ type ConfigFile struct {
 	SSLCertificateFile string
 	SSLKeyFile         string
 
-	UseElasticSearch bool
+	UseESLogStashing bool
 	ESServer         string
 	ESIndexPrefix    string
 	ESHostName       string