diff --git a/magnolia-templatebuilder/src/main/java/com/merkle/oss/magnolia/templatebuilder/TemplateDefinitionProvider.java b/magnolia-templatebuilder/src/main/java/com/merkle/oss/magnolia/templatebuilder/TemplateDefinitionProvider.java
index 1dfee1e..86f4912 100644
--- a/magnolia-templatebuilder/src/main/java/com/merkle/oss/magnolia/templatebuilder/TemplateDefinitionProvider.java
+++ b/magnolia-templatebuilder/src/main/java/com/merkle/oss/magnolia/templatebuilder/TemplateDefinitionProvider.java
@@ -95,7 +95,7 @@ public TemplateDefinition getInternal() throws Registry.InvalidDefinitionExcepti
         template.setDeletable(annotation.deletable().getValue());
         template.setAreas(getAreas(template, factoryObject.getClass()));
         Optional.of(annotation.modelClass()).filter(RenderingModel.class::isAssignableFrom).ifPresent(template::setModelClass);
-        Optional.ofNullable(StringUtils.trimToNull(annotation.templateScript())).ifPresent(template::setTemplateScript);
+        template.setTemplateScript(annotation.templateScript());
         dynamicFragment(factoryObject.getClass()).ifPresent(template::setFragmentDefinition);
         return template;
     }
@@ -117,7 +117,7 @@ protected AreaDefinition getAreaDefinition(final ConfiguredTemplateDefinition te
         Optional.of(annotation.maxComponents()).filter(max -> Integer.MAX_VALUE != max).ifPresent(area::setMaxComponents);
         area.setOptional(annotation.optional().getValue());
         area.setCreateAreaNode(annotation.createAreaNode().getValue());
-        Optional.ofNullable(StringUtils.trimToNull(annotation.templateScript())).ifPresent(area::setTemplateScript);
+        area.setTemplateScript(annotation.templateScript()); // If the templateScript is null the area is rendered simply by looping the components. (default annotation value is undefined)
         getInheritanceConfiguration(areaClazz).ifPresent(area::setInheritance);
         getAutoGenerationConfiguration(template, area, areaClazz).ifPresent(area::setAutoGeneration);
         area.setAvailableComponents(getAvailableComponents(areaClazz));
diff --git a/magnolia-templatebuilder/src/main/java/com/merkle/oss/magnolia/templatebuilder/annotation/Template.java b/magnolia-templatebuilder/src/main/java/com/merkle/oss/magnolia/templatebuilder/annotation/Template.java
index c36d263..992b1b7 100644
--- a/magnolia-templatebuilder/src/main/java/com/merkle/oss/magnolia/templatebuilder/annotation/Template.java
+++ b/magnolia-templatebuilder/src/main/java/com/merkle/oss/magnolia/templatebuilder/annotation/Template.java
@@ -23,7 +23,7 @@
 
     String dialog() default "";
 
-    String templateScript() default "";
+    String templateScript() default "undefined";
 
     /**
      * Defines the visibility of the template. When set to false the template is never presented in the user interface.
diff --git a/magnolia-templatebuilder/src/main/java/com/merkle/oss/magnolia/templatebuilder/annotation/area/Area.java b/magnolia-templatebuilder/src/main/java/com/merkle/oss/magnolia/templatebuilder/annotation/area/Area.java
index 2f28c57..55afa92 100644
--- a/magnolia-templatebuilder/src/main/java/com/merkle/oss/magnolia/templatebuilder/annotation/area/Area.java
+++ b/magnolia-templatebuilder/src/main/java/com/merkle/oss/magnolia/templatebuilder/annotation/area/Area.java
@@ -20,7 +20,7 @@
      */
     String renderer() default "";
 
-    String templateScript() default "";
+    String templateScript() default "undefined";
 
     String title() default "";