diff --git a/lib/helpers/configuration.js b/lib/helpers/configuration.js
index 00ef231dd..72ae61fa8 100644
--- a/lib/helpers/configuration.js
+++ b/lib/helpers/configuration.js
@@ -177,7 +177,7 @@ class Configuration {
       }
     });
 
-    if (this.scopes.has('offline_access')) {
+    if (this.scopes.has('offline_access') || this.issueRefreshToken !== defaults.issueRefreshToken) {
       this.grantTypes.add('refresh_token');
     }
 
diff --git a/test/configuration/offline_access.test.js b/test/configuration/offline_access.test.js
new file mode 100644
index 000000000..6ee9f69e8
--- /dev/null
+++ b/test/configuration/offline_access.test.js
@@ -0,0 +1,30 @@
+const { expect } = require('chai');
+
+const { Provider } = require('../../lib');
+
+describe('Provider declaring support for refresh_token grant type', () => {
+  it('is enabled by default', () => {
+    const provider = new Provider('https://op.example.com');
+    expect(i(provider).configuration().grantTypes).to.contain('refresh_token');
+  });
+
+  it('isnt enabled when offline_access isnt amongst the scopes', () => {
+    const provider = new Provider('https://op.example.com', { scopes: ['openid'] });
+    expect(i(provider).configuration().grantTypes).not.to.contain('refresh_token');
+  });
+
+  it('is enabled when offline_access isnt amongst the scopes', () => {
+    const provider = new Provider('https://op.example.com', { scopes: ['openid', 'offline_access'] });
+    expect(i(provider).configuration().grantTypes).to.contain('refresh_token');
+  });
+
+  it('is enabled when issueRefreshToken configuration function is configured', () => {
+    const provider = new Provider('https://op.example.com', {
+      scopes: ['openid'],
+      issueRefreshToken() {
+        return true;
+      },
+    });
+    expect(i(provider).configuration().grantTypes).to.contain('refresh_token');
+  });
+});