diff --git a/src/AuthorizationServer.php b/src/AuthorizationServer.php
index f8674004..42313bff 100644
--- a/src/AuthorizationServer.php
+++ b/src/AuthorizationServer.php
@@ -121,14 +121,11 @@ class AuthorizationServer implements EmitterAwareInterface
         $grantType->setAccessTokenRepository($this->accessTokenRepository);
         $grantType->setClientRepository($this->clientRepository);
         $grantType->setScopeRepository($this->scopeRepository);
+        $grantType->setDefaultScope($this->defaultScope);
         $grantType->setPrivateKey($this->privateKey);
         $grantType->setEmitter($this->getEmitter());
         $grantType->setEncryptionKey($this->encryptionKey);
 
-        if ($grantType instanceof AbstractAuthorizeGrant) {
-            $grantType->setDefaultScope($this->defaultScope);
-        }
-
         $this->enabledGrantTypes[$grantType->getIdentifier()] = $grantType;
         $this->grantTypeAccessTokenTTL[$grantType->getIdentifier()] = $accessTokenTTL;
     }