diff --git a/Frameworks/EOF/ERRest/Sources/er/rest/routes/ERXRouteController.java b/Frameworks/EOF/ERRest/Sources/er/rest/routes/ERXRouteController.java
index 30cd52d9e86..38e1f799b8c 100644
--- a/Frameworks/EOF/ERRest/Sources/er/rest/routes/ERXRouteController.java
+++ b/Frameworks/EOF/ERRest/Sources/er/rest/routes/ERXRouteController.java
@@ -1822,6 +1822,7 @@ public <T extends ERXRouteController> T controller(Class<T> controllerClass) {
 	 */
 	public void dispose() {
 		if (_shouldDisposeEditingContext && _editingContext != null) {
+			ERXEC.unlockAllContextsForCurrentThread();
 			_editingContext.dispose();
 			_editingContext = null;
 		}