diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
index 96ed988c35d..fb9e83cf308 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
@@ -136,6 +136,16 @@ public class DatastoreMO extends BaseMO {
             fullPath = String.format("[%s] %s", datastoreName, path);
 
         _context.getService().makeDirectory(morFileManager, fullPath, morDc, true);
+
+        int retry = 2;
+        for (int i = 0; i < retry; i++) {
+            DatastoreFile datastoreFile = new DatastoreFile(fullPath);
+            if (!folderExists(String.format("[%s]", datastoreName), datastoreFile.getFileName())) {
+                _context.getService().makeDirectory(morFileManager, fullPath, morDc, true);
+            } else {
+                return;
+            }
+        }
     }
 
     String getDatastoreRootPath() throws Exception {