diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index d46136173..3858979ef 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -220,7 +220,7 @@ final class ActivityController extends AbstractController
             $this->entityManager->persist($entity);
             $this->entityManager->flush();
 
-            if ($form->has('gendocTemplateId') && '' !== $form['gendocTemplateId']) {
+            if ($form->has('gendocTemplateId') && null !== $form['gendocTemplateId']->getData()) {
                 return $this->redirectToRoute(
                     'chill_docgenerator_generate_from_template',
                     [
@@ -437,7 +437,7 @@ final class ActivityController extends AbstractController
             $this->entityManager->persist($entity);
             $this->entityManager->flush();
 
-            if ($form->has('gendocTemplateId') && '' !== $form['gendocTemplateId']) {
+            if ($form->has('gendocTemplateId') && null !== $form['gendocTemplateId']->getData()) {
                 return $this->redirectToRoute(
                     'chill_docgenerator_generate_from_template',
                     [