diff --git a/src/Mooc/Videos/Application/Find/FindLastVideoQuery.php b/src/Mooc/Videos/Application/Find/FindLastVideoQuery.php
new file mode 100644
index 000000000..301bfa1e2
--- /dev/null
+++ b/src/Mooc/Videos/Application/Find/FindLastVideoQuery.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CodelyTv\Mooc\Videos\Application\Find;
+
+
+use CodelyTv\Shared\Domain\Bus\Query\Query;
+
+final class FindLastVideoQuery  implements Query
+{
+    public function __construct()
+    {
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/Mooc/Videos/Application/Find/FindLastVideoQueryHandler.php b/src/Mooc/Videos/Application/Find/FindLastVideoQueryHandler.php
new file mode 100644
index 000000000..177bf319f
--- /dev/null
+++ b/src/Mooc/Videos/Application/Find/FindLastVideoQueryHandler.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CodelyTv\Mooc\Videos\Application\Find;
+
+
+use CodelyTv\Mooc\Videos\Domain\Video;
+use CodelyTv\Mooc\Videos\Domain\VideoRepository;
+
+final class FindLastVideoQueryHandler
+{
+    public function __construct(private VideoRepository $videoRepository)
+    {
+    }
+
+    public function __invoke(FindLastVideoQuery $findLastVideoQuery): ?Video
+    {
+        return $this->videoRepository->findLastVideo();
+    }
+}
\ No newline at end of file
diff --git a/src/Mooc/Videos/Domain/VideoRepository.php b/src/Mooc/Videos/Domain/VideoRepository.php
index 7e68907a8..fa64fcede 100644
--- a/src/Mooc/Videos/Domain/VideoRepository.php
+++ b/src/Mooc/Videos/Domain/VideoRepository.php
@@ -12,5 +12,7 @@ public function save(Video $video): void;
 
     public function search(VideoId $id): ?Video;
 
+    public function findLastVideo(): ?Video;
+
     public function searchByCriteria(Criteria $criteria): Videos;
 }
diff --git a/src/Mooc/Videos/Infrastructure/Persistence/VideoRepositoryMySql.php b/src/Mooc/Videos/Infrastructure/Persistence/VideoRepositoryMySql.php
index 933277438..5b58f7a0a 100644
--- a/src/Mooc/Videos/Infrastructure/Persistence/VideoRepositoryMySql.php
+++ b/src/Mooc/Videos/Infrastructure/Persistence/VideoRepositoryMySql.php
@@ -32,6 +32,12 @@ public function search(VideoId $id): ?Video
         return $this->repository(Video::class)->find($id);
     }
 
+    public function findLastVideo(): ?Video
+    {
+        return $this->repository(Video::class)->findOneBy([], ['id' => 'DESC']);
+    }
+
+
     public function searchByCriteria(Criteria $criteria): Videos
     {
         $doctrineCriteria = DoctrineCriteriaConverter::convert($criteria, self::$criteriaToDoctrineFields);
diff --git a/src/Mooc/Videos/Infrastructure/VideoRepositoryInMemory.php b/src/Mooc/Videos/Infrastructure/VideoRepositoryInMemory.php
new file mode 100644
index 000000000..57b2c65b3
--- /dev/null
+++ b/src/Mooc/Videos/Infrastructure/VideoRepositoryInMemory.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CodelyTv\Mooc\Videos\Infrastructure;
+
+
+use CodelyTv\Mooc\Videos\Domain\Video;
+use CodelyTv\Mooc\Videos\Domain\VideoId;
+use CodelyTv\Mooc\Videos\Domain\VideoRepository;
+use CodelyTv\Mooc\Videos\Domain\Videos;
+use CodelyTv\Shared\Domain\Criteria\Criteria;
+
+final class VideoRepositoryInMemory implements VideoRepository
+{
+    private array $videos = [];
+
+    public function save(Video $video): void
+    {
+        $this->videos[] = $video;
+    }
+
+    public function search(VideoId $id): ?Video
+    {
+        foreach ($this->videos as $video) {
+            if ($video->id == $id) {
+                return $video;
+            }
+        }
+        return null;
+    }
+
+    public function findLastVideo(): ?Video
+    {
+        $lastVideo = max($this->videos);
+
+        return ($lastVideo) ? $lastVideo : null;
+    }
+
+    public function searchByCriteria(Criteria $criteria): Videos
+    {
+        // TODO Criteria
+        return new Videos($this->videos);
+    }
+}
\ No newline at end of file
diff --git a/tests/Mooc/Videos/Application/FindLastVideoQueryHandlerTest.php b/tests/Mooc/Videos/Application/FindLastVideoQueryHandlerTest.php
new file mode 100644
index 000000000..823e8c1f1
--- /dev/null
+++ b/tests/Mooc/Videos/Application/FindLastVideoQueryHandlerTest.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CodelyTv\Tests\Mooc\Videos\Application;
+
+
+use CodelyTv\Mooc\Shared\Domain\Courses\CourseId;
+use CodelyTv\Mooc\Shared\Domain\Videos\VideoUrl;
+use CodelyTv\Mooc\Videos\Application\Find\FindLastVideoQuery;
+use CodelyTv\Mooc\Videos\Application\Find\FindLastVideoQueryHandler;
+use CodelyTv\Mooc\Videos\Domain\Video;
+use CodelyTv\Mooc\Videos\Domain\VideoId;
+use CodelyTv\Mooc\Videos\Domain\VideoTitle;
+use CodelyTv\Mooc\Videos\Domain\VideoType;
+use CodelyTv\Mooc\Videos\Infrastructure\VideoRepositoryInMemory;
+use CodelyTv\Tests\Shared\Domain\UuidMother;
+use CodelyTv\Tests\Shared\Infrastructure\PhpUnit\UnitTestCase;
+use Ramsey\Uuid\Uuid as RamseyUuid;
+
+final class FindLastVideoQueryHandlerTest extends UnitTestCase
+{
+
+    /** @test */
+    public function findLastVideo(): void
+    {
+        $videoRepositoryInMemory = new VideoRepositoryInMemory();
+        $videos = $this->createVideos($videoRepositoryInMemory);
+
+        $query = new FindLastVideoQuery();
+        $handler = new FindLastVideoQueryHandler($videoRepositoryInMemory);
+
+        $videoReturned = $handler->__invoke($query);
+
+        $this->assertEquals($videos[1]->id(), $videoReturned->id());
+    }
+
+    public function createVideos(VideoRepositoryInMemory $videoRepositoryInMemory): array
+    {
+        $videos[0] = Video::create(
+            new VideoId(RamseyUuid::uuid4()->toString()),
+            new VideoType(VideoType::SCREENCAST),
+            new VideoTitle('Video 1'),
+            new VideoUrl('http://www.videos.com/video-1'),
+            new CourseId(RamseyUuid::uuid4()->toString())
+        );
+        $videoRepositoryInMemory->save($videos[0]);
+
+        $videos[1]  = Video::create(
+            new VideoId(RamseyUuid::uuid4()->toString()),
+            new VideoType(VideoType::SCREENCAST),
+            new VideoTitle('Video 2'),
+            new VideoUrl('http://www.videos.com/video-2'),
+            new CourseId(RamseyUuid::uuid4()->toString())
+        );
+        $videoRepositoryInMemory->save($videos[1]);
+
+        return $videos;
+    }
+}
\ No newline at end of file