diff --git a/src/Smartstore.Web.Common/Razor/ModuleViewLocationExpander.cs b/src/Smartstore.Web.Common/Razor/ModuleViewLocationExpander.cs
index 027307a268..63198bd9d7 100644
--- a/src/Smartstore.Web.Common/Razor/ModuleViewLocationExpander.cs
+++ b/src/Smartstore.Web.Common/Razor/ModuleViewLocationExpander.cs
@@ -34,7 +34,7 @@ public IEnumerable<string> ExpandViewLocations(ViewLocationExpanderContext conte
                     if (context.Values.TryGetValue(ThemeViewLocationExpander.ParamKey, out var themeName)) // HP
                     {
                         var themeModule = _moduleCatalog.GetModuleByTheme(themeName);
-                        if (themeModule != null && themeModule.DependsOn.Contains(module.SystemName)) 
+                        if (themeModule?.DependsOn?.Contains(module.SystemName) == true)
                         {
                             // Current theme's companion module depends on current module
                             var themeRegistry = context.ActionContext.HttpContext.RequestServices.GetRequiredService<IThemeRegistry>();