diff --git a/spring-boot-starter-sitemesh/src/main/java/org/sitemesh/autoconfigure/SiteMeshAutoConfiguration.java b/spring-boot-starter-sitemesh/src/main/java/org/sitemesh/autoconfigure/SiteMeshAutoConfiguration.java
index 750536d2..8868fdcb 100644
--- a/spring-boot-starter-sitemesh/src/main/java/org/sitemesh/autoconfigure/SiteMeshAutoConfiguration.java
+++ b/spring-boot-starter-sitemesh/src/main/java/org/sitemesh/autoconfigure/SiteMeshAutoConfiguration.java
@@ -28,7 +28,7 @@ public void setMappings(List<HashMap<String, String>> mappings) {
     private String prefix;
     @Value("${spring.sitemesh.decorator.metaTag:decorator}")
     private String metaTagName;
-    @Value("${spring.sitemesh.decorator.bundles}")
+    @Value("${spring.sitemesh.decorator.bundles:}")
     private List<String> bundles;
 
     @Bean
@@ -47,11 +47,9 @@ protected void applyCustomConfiguration(SiteMeshFilterBuilder builder) {
                         builder.addDecoratorPath(decorator.get("path"), decorator.get("decorator"));
                     }
                 }
-                if (bundles != null) {
-                    for (String bundle : bundles) {
-                        if (bundle.trim().equals("sm2")) {
-                            builder.addTagRuleBundle(new Sm2TagRuleBundle());
-                        }
+                for (String bundle : bundles) {
+                    if (bundle.trim().equals("sm2")) {
+                        builder.addTagRuleBundle(new Sm2TagRuleBundle());
                     }
                 }
             }