diff --git a/lib/Alchemy/Phrasea/Media/SubdefGenerator.php b/lib/Alchemy/Phrasea/Media/SubdefGenerator.php
index 9ab4d7ebe0..9612e3bc19 100644
--- a/lib/Alchemy/Phrasea/Media/SubdefGenerator.php
+++ b/lib/Alchemy/Phrasea/Media/SubdefGenerator.php
@@ -18,6 +18,7 @@ use Alchemy\Phrasea\Core\Event\Record\SubDefinitionCreationEvent;
 use Alchemy\Phrasea\Core\Event\Record\SubDefinitionsCreationEvent;
 use Alchemy\Phrasea\Core\Event\Record\SubDefinitionCreationFailedEvent;
 use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
+use Alchemy\Phrasea\Databox\Subdef\MediaSubdefRepository;
 use Alchemy\Phrasea\Filesystem\FilesystemService;
 use Alchemy\Phrasea\Media\Subdef\Specification\PdfSpecification;
 use MediaAlchemyst\Alchemyst;
@@ -170,13 +171,35 @@ class SubdefGenerator
             unset($this->tmpFilePath);
         }
 
-        $this->dispatch(
-            RecordEvents::SUB_DEFINITIONS_CREATED,
-            new SubDefinitionsCreatedEvent(
-                $record,
-                $mediaCreated
-            )
-        );
+        // if we created subdef one by one
+        if (count($wanted_subdefs) == 1) {
+            $mediaSubdefRepository = $this->getMediaSubdefRepository($record->getDataboxId());
+            $mediaSubdefs = $mediaSubdefRepository->findByRecordIdsAndNames([$record->getRecordId()]);
+            $medias = [];
+            foreach ($mediaSubdefs as $subdef) {
+                try {
+                    $medias[$subdef->get_name()] = $this->mediavorus->guess($subdef->getRealPath());
+                } catch (MediaVorusFileNotFoundException $e) {
+
+                }
+            }
+
+            $this->dispatch(
+                RecordEvents::SUB_DEFINITIONS_CREATED,
+                new SubDefinitionsCreatedEvent(
+                    $record,
+                    $medias
+                )
+            );
+        } else {
+            $this->dispatch(
+                RecordEvents::SUB_DEFINITIONS_CREATED,
+                new SubDefinitionsCreatedEvent(
+                    $record,
+                    $mediaCreated
+                )
+            );
+        }
     }
 
     /**
@@ -294,4 +317,14 @@ class SubdefGenerator
         $i = floor(log($bytes, 1024));
         return round($bytes / pow(1024, $i), [0,0,2,2,3][$i]).['B','kB','MB','GB'][$i];
     }
+
+    /**
+     * @param $databoxId
+     *
+     * @return MediaSubdefRepository|Object
+     */
+    private function getMediaSubdefRepository($databoxId)
+    {
+        return $this->app['provider.repo.media_subdef']->getRepositoryForDatabox($databoxId);
+    }
 }