diff --git a/src/Grant/AbstractGrant.php b/src/Grant/AbstractGrant.php
index 0fe2c987..f4fe47ba 100644
--- a/src/Grant/AbstractGrant.php
+++ b/src/Grant/AbstractGrant.php
@@ -161,10 +161,10 @@ abstract class AbstractGrant implements GrantTypeInterface
         }
 
         $client = $this->clientRepository->getClientEntity(
+            $this->getIdentifier(),
             $clientId,
             $clientSecret,
-            null,
-            $this->getIdentifier()
+            null
         );
 
         if (!$client instanceof ClientEntityInterface) {
diff --git a/src/Repositories/ClientRepositoryInterface.php b/src/Repositories/ClientRepositoryInterface.php
index 0cd88ad2..3bec9452 100644
--- a/src/Repositories/ClientRepositoryInterface.php
+++ b/src/Repositories/ClientRepositoryInterface.php
@@ -19,12 +19,12 @@ interface ClientRepositoryInterface extends RepositoryInterface
     /**
      * Get a client
      *
+     * @param string      $grantType        The grant type used
      * @param string      $clientIdentifier The client's identifier
-     * @param string      $clientSecret     The client's secret
+     * @param string|null $clientSecret     The client's secret
      * @param string|null $redirectUri      The client's redirect URI
-     * @param string|null $grantType        The grant type used
      *
      * @return \League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface
      */
-    public function getClientEntity($clientIdentifier, $clientSecret, $redirectUri = null, $grantType = null);
+    public function getClientEntity($grantType, $clientIdentifier, $clientSecret = null, $redirectUri = null);
 }