diff --git a/src/Service/UwBlockAutoRender.php b/src/Service/UwBlockAutoRender.php
index f23d2d7459471478db3cd92cba81f5ec1f4211b5..ede60072447b57de487ce1d43e3a9a5cf6b93483 100644
--- a/src/Service/UwBlockAutoRender.php
+++ b/src/Service/UwBlockAutoRender.php
@@ -369,21 +369,25 @@ class UwBlockAutoRender {
     if (isset($config['date'])) {
       $date = $config['date'];
       if ($date === 'now') {
+
         // Use event_block_current block display.
-        $view->setDisplay('event_block_current');
+        $display_id = 'event_block_current';
       }
       elseif ($date === 'past') {
+
         // Use event_block_past block display.
-        $view->setDisplay('event_block_past');
+        $display_id = 'event_block_past';
       }
       elseif ($date === 'all') {
+
         // Use event_block_all block display.
-        $view->setDisplay('event_block_all');
+        $display_id = 'event_block_all';
       }
       elseif ($date === 'range') {
         if (isset($config['from']) && isset($config['to'])) {
+
           // Use event_block_range block display.
-          $view->setDisplay('event_block_range');
+          $display_id = 'event_block_range';
 
           // Get 'from' and 'to' inputs.
           $from = gmdate("Y-m-d", $config['from']->getTimestamp());
@@ -412,9 +416,12 @@ class UwBlockAutoRender {
     }
     // For existing site without date field.
     else {
-      $view->setDisplay('events_listing_block');
+      $display_id = 'events_listing_block';
     }
 
+    // Set the display id for the view.
+    $view->setDisplay($display_id);
+
     // The filters to be used in the view.
     $filters_to_use = [
       'tags' => 'field_uw_event_tags_target_id',
@@ -456,13 +463,15 @@ class UwBlockAutoRender {
 
     // Execute the view.
     $view->execute();
-    // Get the render array.
+
+    // Return the render array for the view.
     return [
-      '#theme' => 'uw_block_views_list',
-      '#items' => [
-        'view' => $view->render(),
-        'type' => 'view',
-      ],
+      '#type' => 'view',
+      '#name' => 'view_name',
+      '#view' => $view,
+      '#display_id' => $display_id,
+      '#embed' => TRUE,
+      '#cache' => $view->getCacheTags(),
     ];
   }