diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java
index ca6b6ff7000..e42a24e86eb 100644
--- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java
+++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.EmptyStackException;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -335,7 +336,7 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet {
 
     private Set<Resource> collectInheritedResources(ModuleDefinition def) {
         if (def == null) {
-            return new LinkedHashSet<>();
+            return Collections.emptySet();
         }
 
         if (configResourcesMap.containsKey(def.getName())) {