diff --git a/src/Controller/Callback.php b/src/Controller/Callback.php
index 0150034718ab8e9414a4f4d38e8073d6a100fc51..28c9ba5e30de712cf9319c30585ad7a8c53e1ca3 100644
--- a/src/Controller/Callback.php
+++ b/src/Controller/Callback.php
@@ -7,7 +7,6 @@ use Drupal\Core\Link;
 use Drupal\Core\Routing\TrustedRedirectResponse;
 use Drupal\google_api_client\Service\GoogleApiClientService;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -91,9 +90,8 @@ class Callback extends ControllerBase {
         $google_api_client->setAuthenticated(TRUE);
         $google_api_client->save();
         unset($_SESSION['google_api_client_account_id']);
-        $response = new RedirectResponse('/admin/config/services/google_api_client');
         \Drupal::messenger()->addMessage(t('Api Account saved'));
-        return $response;
+        $this->redirect('entity.google_api_client.collection')->send();
       }
       if ($this->googleApiClient->googleClient) {
         $auth_url = $this->googleApiClient->googleClient->createAuthUrl();
@@ -103,8 +101,7 @@ class Callback extends ControllerBase {
     }
     // Let other modules act of google response.
     \Drupal::moduleHandler()->invokeAll('google_api_client_google_response', [$request]);
-    $response = new RedirectResponse('/admin/config/services/google_api_client');
-    return $response;
+    $this->redirect('entity.google_api_client.collection')->send();
   }
 
 }
diff --git a/src/Form/GoogleApiClientDeleteForm.php b/src/Form/GoogleApiClientDeleteForm.php
index 274464b59d0e1e54ef9c181d1d80793819a6509a..a16174516936a5a654ab0f0d7a72796ad8317467 100644
--- a/src/Form/GoogleApiClientDeleteForm.php
+++ b/src/Form/GoogleApiClientDeleteForm.php
@@ -5,7 +5,6 @@ namespace Drupal\google_api_client\Form;
 use Drupal\Core\Entity\ContentEntityConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 
 /**
  * Provides a form for deleting a google_api_client entity.
@@ -50,8 +49,7 @@ class GoogleApiClientDeleteForm extends ContentEntityConfirmFormBase {
     $google_api_client->delete();
     parent::submitForm($form, $form_state);
     \Drupal::messenger()->addMessage('GoogleApiClient account deleted successfully');
-    $response = new RedirectResponse('/admin/config/services/google_api_client');
-    $response->send();
+    $this->redirect('entity.google_api_client.collection')->send();
   }
 
 }
diff --git a/src/Form/GoogleApiClientRevokeForm.php b/src/Form/GoogleApiClientRevokeForm.php
index c2b6488db6dabbaf69e7bb725209da25ed9edc39..8ae7caf46e7df2e9e183e3e38872370533faef7a 100644
--- a/src/Form/GoogleApiClientRevokeForm.php
+++ b/src/Form/GoogleApiClientRevokeForm.php
@@ -5,7 +5,6 @@ namespace Drupal\google_api_client\Form;
 use Drupal\Core\Entity\ContentEntityConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 
 /**
  * Provides a form for revoking a google_api_client entity.
@@ -55,8 +54,7 @@ class GoogleApiClientRevokeForm extends ContentEntityConfirmFormBase {
     $google_api_client->save();
     parent::submitForm($form, $form_state);
     \Drupal::messenger()->addMessage('GoogleApiClient account revoked successfully');
-    $response = new RedirectResponse('/admin/config/services/google_api_client');
-    $response->send();
+    $this->redirect('entity.google_api_client.collection')->send();
   }
 
 }
diff --git a/src/Form/GoogleApiServiceClientDeleteForm.php b/src/Form/GoogleApiServiceClientDeleteForm.php
index c926f0e51d065c8eb764431a7950fb5dbd40e247..16e405c53aaa207a3309fdc6dc3fca673f0b0828 100644
--- a/src/Form/GoogleApiServiceClientDeleteForm.php
+++ b/src/Form/GoogleApiServiceClientDeleteForm.php
@@ -5,7 +5,6 @@ namespace Drupal\google_api_client\Form;
 use Drupal\Core\Entity\EntityConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 
 /**
  * Provides a form for deleting a google_api_service_client entity.
@@ -50,8 +49,7 @@ class GoogleApiServiceClientDeleteForm extends EntityConfirmFormBase {
     $google_api_service_client->delete();
     parent::submitForm($form, $form_state);
     \Drupal::messenger()->addMessage('GoogleApiServiceClient account deleted successfully');
-    $response = new RedirectResponse('/admin/config/services/google_api_service_client');
-    $response->send();
+    $this->redirect('entity.google_api_client.collection')-send();
   }
 
 }