diff --git a/java/src/main/java/com/genexus/specific/java/JavaModelContextExtension.java b/java/src/main/java/com/genexus/specific/java/JavaModelContextExtension.java
index 1f1ba9537..538fa6245 100644
--- a/java/src/main/java/com/genexus/specific/java/JavaModelContextExtension.java
+++ b/java/src/main/java/com/genexus/specific/java/JavaModelContextExtension.java
@@ -166,6 +166,7 @@ public void afterGetConnection(ModelContext modelContext, int handle, AbstractDa
     public ModelContext submitCopy(ModelContext modelContext) {
         ModelContext newContext = new ModelContext(modelContext);
         newContext.setHttpContext(new HttpContextNull());
+		newContext.setCurrentTimeZone(modelContext.getClientTimeZone());
         initializeSubmitSession(modelContext, newContext);
         HttpContext ctx = (HttpContext) modelContext.getHttpContext();
         if (ctx != null)
diff --git a/java/src/main/java/com/genexus/util/SubmitThreadPool.java b/java/src/main/java/com/genexus/util/SubmitThreadPool.java
index 65cd37179..8c95fedb8 100644
--- a/java/src/main/java/com/genexus/util/SubmitThreadPool.java
+++ b/java/src/main/java/com/genexus/util/SubmitThreadPool.java
@@ -28,8 +28,7 @@ public synchronized static void submit(final ISubmitteable proc, final int id, f
 			{
 				public void run()
 				{
-					if (ctx.threadModelContext.get() == null)
-						ctx.threadModelContext.set(ctx);
+					ctx.threadModelContext.set(ctx);
 					proc.submit(id, submitParms, ctx);
 					SubmitThreadPool.decRemainingSubmits();
 				}
@@ -190,8 +189,7 @@ public void run()
 			// Ejecuto el submit
 			try
 			{
-				if (context.threadModelContext.get() == null)
-					context.threadModelContext.set(context);
+				context.threadModelContext.set(context);
 				proc.submit(submitId, submitParms, context);
 			}catch(Throwable e)
 			{