diff --git a/src/Controller/ViewsShareController.php b/src/Controller/ViewsShareController.php
index 827e537ae986ee09bcd4b6729e536de5fa83ff85..e1ec06d09af0b9954e8b16278b27333749168ba6 100644
--- a/src/Controller/ViewsShareController.php
+++ b/src/Controller/ViewsShareController.php
@@ -378,11 +378,14 @@ class ViewsShareController extends ControllerBase {
     $base_url = $this->requestStack->getCurrentRequest()->getSchemeAndHttpHost();
     $query = $this->requestStack->getCurrentRequest()->query->all();
 
+    $width = (int) $handler_options['embed_width'] ?? 600;
+    $height = (int) $handler_options['embed_height'] ?? 400;
+
     $oembed_data = [
       'version' => '1.0',
       'type' => 'rich',
-      'width' => $handler_options['embed_width'] ?? 600,
-      'height' => $handler_options['embed_height'] ?? 400,
+      'width' => $width,
+      'height' => $height,
       'title' => $view->getTitle(),
       'url' => ViewsShareHelper::getEmbedUrl($view, $query, TRUE, TRUE),
       'provider_name' => $this->config('system.site')->get('name'),
@@ -390,8 +393,8 @@ class ViewsShareController extends ControllerBase {
       'html' => ViewsShareHelper::getEmbedCode(
         $view,
         $query,
-        (int) ($handler_options['embed_width'] ?? 600),
-        (int) ($handler_options['embed_height'] ?? 400),
+        $width,
+        $height,
         $handler_options['embed_style'] ?? ''
       ),
     ];