diff --git a/src/datastore_mad/remotes/vcenter/rm b/src/datastore_mad/remotes/vcenter/rm
index 131f8da618..35f96c6af5 100755
--- a/src/datastore_mad/remotes/vcenter/rm
+++ b/src/datastore_mad/remotes/vcenter/rm
@@ -79,7 +79,8 @@ begin
                 ds.delete_file(img_src)
             end
 
-            ds.rm_directory(img_dir) if ds.dir_empty?(img_dir)
+            vcenter_version = vi_client.vim.serviceContent.about.apiVersion
+            ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) && vcenter_version != "6.5"
 
         rescue Exception => e
             if !e.message.start_with?('FileNotFound')
diff --git a/src/tm_mad/vcenter/delete b/src/tm_mad/vcenter/delete
index 83ad9efc20..f300243587 100755
--- a/src/tm_mad/vcenter/delete
+++ b/src/tm_mad/vcenter/delete
@@ -119,7 +119,8 @@ if path.match(/disk\.\d+$/)
 
                         ds.delete_virtual_disk(img_path)
                         img_dir = File.dirname(img_path)
-                        ds.rm_directory(img_dir) if ds.dir_empty?(img_dir)
+                        vcenter_version = vi_client.vim.serviceContent.about.apiVersion
+                        ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) && vcenter_version != "6.5"
 
                     rescue Exception => e
                         if !e.message.start_with?('FileNotFound')