diff --git a/data/global.xml b/data/global.xml
index 28956b7..296edb1 100644
--- a/data/global.xml
+++ b/data/global.xml
@@ -71,7 +71,7 @@
   <globalServices>true</globalServices>
   <xmlPostRequestLogBufferSize>1024</xmlPostRequestLogBufferSize>
   <xmlExternalEntitiesEnabled>false</xmlExternalEntitiesEnabled>
-  <lockProviderName>nullLockProvider</lockProviderName>
+  <lockProviderName>memoryLockProvider</lockProviderName>
   <webUIMode>DEFAULT</webUIMode>
   <resourceErrorHandling>SKIP_MISCONFIGURED_LAYERS</resourceErrorHandling>
 </global>
diff --git a/data/gwc-gs.xml b/data/gwc-gs.xml
index 19d8d4b..cd31242 100644
--- a/data/gwc-gs.xml
+++ b/data/gwc-gs.xml
@@ -58,5 +58,5 @@
     <string>image/gif</string>
     <string>image/png8</string>
   </defaultOtherCacheFormats>
-  <lockProviderName>noLock</lockProviderName>
+  <lockProviderName>globalLock</lockProviderName>
 </GeoServerGWCConfig>