diff --git a/Models/SurveyTemplate.php b/Models/SurveyTemplate.php
index bb50ad3..5ab191d 100644
--- a/Models/SurveyTemplate.php
+++ b/Models/SurveyTemplate.php
@@ -16,6 +16,7 @@ namespace Modules\Surveys\Models;
 
 use Modules\Admin\Models\Account;
 use Modules\Media\Models\Media;
+use Modules\Tag\Models\NullTag;
 use Modules\Tag\Models\Tag;
 use phpOMS\Localization\ISO639x1Enum;
 
diff --git a/Models/SurveyTemplateElementMapper.php b/Models/SurveyTemplateElementMapper.php
index 6a55633..bad2d95 100644
--- a/Models/SurveyTemplateElementMapper.php
+++ b/Models/SurveyTemplateElementMapper.php
@@ -52,6 +52,7 @@ final class SurveyTemplateElementMapper extends DataMapperFactory
             'mapper'            => SurveyTemplateElementL11nMapper::class,
             'table'             => 'survey_template_element_l11n',
             'self'              => 'survey_template_element_l11n_element',
+            'conditional'       => true,
             'external'          => null,
         ],
         'labels' => [
diff --git a/Models/SurveyTemplateMapper.php b/Models/SurveyTemplateMapper.php
index fc02844..41a2317 100644
--- a/Models/SurveyTemplateMapper.php
+++ b/Models/SurveyTemplateMapper.php
@@ -64,6 +64,7 @@ final class SurveyTemplateMapper extends DataMapperFactory
             'mapper'            => SurveyTemplateL11nMapper::class,
             'table'             => 'survey_template_l11n',
             'self'              => 'survey_template_l11n_template',
+            'conditional'       => true,
             'external'          => null,
         ],
         'tags' => [