diff --git a/file-repository-core/src/main/java/org/genesys/filerepository/service/impl/RepositoryServiceImpl.java b/file-repository-core/src/main/java/org/genesys/filerepository/service/impl/RepositoryServiceImpl.java
index 5383da8b1cf7e7fdc9622f85ef2642f68e20e87e..915066f220980885f68adc255c7fde765d6ae521 100644
--- a/file-repository-core/src/main/java/org/genesys/filerepository/service/impl/RepositoryServiceImpl.java
+++ b/file-repository-core/src/main/java/org/genesys/filerepository/service/impl/RepositoryServiceImpl.java
@@ -1000,7 +1000,7 @@ public class RepositoryServiceImpl implements RepositoryService, InitializingBea
 
 		RepositoryFolder folder = folderRepository.findByPath(cPath.toString());
 		if (folder != null) {
-			if (folder.getChildren().size() > 0 || folder.getFiles().size() > 0) {
+			if (folder.getChildren().size() > 0 || repositoryFilePersistence.countByFolder(folder) > 0) {
 				throw new FolderNotEmptyException("Folder " + path.toString() + " is not empty.");
 			}