diff --git a/cmis.module b/cmis.module
index cee0474..bd5a6f8 100644
--- a/cmis.module
+++ b/cmis.module
@@ -140,7 +140,7 @@ function template_preprocess_cmis_content_properties(&$variables) {
       '#header' => [t('Property'), t('Value')],
       '#rows' => $rows,
     ];
-    $variables['properties'] = render($table);
+    $variables['properties'] = \Drupal::service('renderer')->render($table);
   }
 }
 
diff --git a/src/CmisBrowser.php b/src/CmisBrowser.php
index 0eef082..1eacdef 100644
--- a/src/CmisBrowser.php
+++ b/src/CmisBrowser.php
@@ -115,7 +115,7 @@ class CmisBrowser {
     $this->init($config, $folder_id);
     if ($this->connection && !empty($this->current) && $browse = $this->browse()) {
       $response = new AjaxResponse();
-      $content = render($browse);
+      $content = \Drupal::service('renderer')->render($browse);
       $response->addCommand(new HtmlCommand('#cmis-browser-wrapper', $content));
 
       return $response;
@@ -181,7 +181,7 @@ class CmisBrowser {
       return [
         '#theme' => 'cmis_content_properties',
         '#object' => $this->current,
-        '#download' => render($path),
+        '#download' => \Drupal::service('renderer')->render($path),
       ];
     }
   }
@@ -334,7 +334,7 @@ class CmisBrowser {
         $url->setOptions($link_options);
         $path = Link::fromTextAndUrl($title, $url)->toRenderable();
         $links[] = [
-          '#markup' => render($path),
+          '#markup' => \Drupal::service('renderer')->render($path),
           '#wrapper_attributes' => [
             'class' => ['object-properties'],
           ],
@@ -347,7 +347,7 @@ class CmisBrowser {
         '#type' => 'ul',
       ];
 
-      return render($list);
+      return \Drupal::service('renderer')->render($list);
     }
   }
 
diff --git a/src/CmisElement.php b/src/CmisElement.php
index f710538..b14af60 100644
--- a/src/CmisElement.php
+++ b/src/CmisElement.php
@@ -133,7 +133,7 @@ class CmisElement {
           '#element' => $name,
             // '#cache' => $this->cacheable,.
         ];
-        $this->data = [render($element)];
+        $this->data = [\Drupal::service('renderer')->render($element)];
     }
   }
 
@@ -198,8 +198,8 @@ class CmisElement {
         // '#cache' => $this->cacheable,.
     ];
     $this->data = [
-      render($element),
-      render($details),
+      \Drupal::service('renderer')->render($element),
+      \Drupal::service('renderer')->render($details),
       $author,
       $created,
       $description,
@@ -231,11 +231,11 @@ class CmisElement {
       ];
       $url->setOptions($link_options);
       $path = Link::fromTextAndUrl($this->t('Choose'), $url)->toRenderable();
-      $operations = render($path);
+      $operations = \Drupal::service('renderer')->render($path);
     }
     $url = Url::fromUserInput('/cmis/document/' . $this->config . '/' . $id);
     $path = Link::fromTextAndUrl($data, $url)->toRenderable();
-    $data = ['#markup' => render($path)];
+    $data = ['#markup' => \Drupal::service('renderer')->render($path)];
   }
 
   /**
@@ -279,7 +279,7 @@ class CmisElement {
       ];
       $url_operation->setOptions($link_options_operations);
       $path = Link::fromTextAndUrl($this->t('Choose folder'), $url_operation)->toRenderable();
-      $operations = render($path);
+      $operations = \Drupal::service('renderer')->render($path);
       $link_options['query'] = ['type' => 'popup'];
     }
 
@@ -310,7 +310,7 @@ class CmisElement {
     $url->setOptions($link_options);
     $path = Link::fromTextAndUrl($this->t('Properties'), $url)->toRenderable();
     $links[] = [
-      '#markup' => render($path),
+      '#markup' => \Drupal::service('renderer')->render($path),
       '#wrapper_attributes' => [
         'class' => [
           'object-properties',
@@ -347,7 +347,7 @@ class CmisElement {
       $url->setOptions($link_options);
       $path = Link::fromTextAndUrl($this->t('Delete'), $url)->toRenderable();
       $links[] = [
-        '#markup' => render($path),
+        '#markup' => \Drupal::service('renderer')->render($path),
         '#wrapper_attributes' => [
           'class' => [
             'object-delete',
@@ -362,7 +362,7 @@ class CmisElement {
       '#type' => 'ul',
     ];
 
-    $operations = render($list);
+    $operations = \Drupal::service('renderer')->render($list);
   }
 
 }
diff --git a/src/Controller/CmisRepositoryController.php b/src/Controller/CmisRepositoryController.php
index ccd8ecc..566bcc8 100644
--- a/src/Controller/CmisRepositoryController.php
+++ b/src/Controller/CmisRepositoryController.php
@@ -147,7 +147,7 @@ class CmisRepositoryController extends ControllerBase {
     $link_options = ['query' => $parameters];
     $url->setOptions($link_options);
     $path = Link::fromTextAndUrl($this->t('Delete'), $url)->toRenderable();
-    $link = render($path);
+    $link = \Drupal::service('renderer')->render($path);
 
     return [
       '#theme' => 'cmis_object_delete_verify',
diff --git a/src/Form/CmisQueryForm.php b/src/Form/CmisQueryForm.php
index 6504fbd..b3dfc66 100644
--- a/src/Form/CmisQueryForm.php
+++ b/src/Form/CmisQueryForm.php
@@ -188,7 +188,7 @@ class CmisQueryForm extends FormBase {
           '#elements' => $rows,
         ];
 
-        $content = render($table);
+        $content = \Drupal::service('renderer')->render($table);
       }
     }