diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java
index 6fb1ee9d284..80de0283e62 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java
+++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java
@@ -1307,8 +1307,14 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 
 			DataElement queryCmd = ds.localDescriptorQuery(encodingElement.getDescriptor(), C_SYSTEM_ENCODING);
 
-			ds.command(queryCmd, encodingElement, true);
+			DataElement status = ds.command(queryCmd, encodingElement, true);
 
+			try {
+				getStatusMonitor(ds).waitForUpdate(status);
+			}
+			catch (Exception e) {
+			}
+			
 			remoteEncoding = encodingElement.getValue();
 		}