diff --git a/src/Controller/BlockController.php b/src/Controller/BlockController.php
index 2ddb4c0b5..7bde19343 100755
--- a/src/Controller/BlockController.php
+++ b/src/Controller/BlockController.php
@@ -44,7 +44,7 @@ public function renderBlockAction(Request $request): Response
 
         $view = View::create($block);
         $blockTemplateResolver = $this->get('bitbag_sylius_cms_plugin.resolver.block_template');
-        $template = $blockTemplateResolver->resolveTemplate($block);
+        $template = $request->get('template') ?? $blockTemplateResolver->resolveTemplate($block);
 
         if ($configuration->isHtmlRequest()) {
             $view