diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
index 349234d4f97..0f70e5c6a45 100644
--- a/lib/cli/interactive-setup/aws-credentials.js
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -319,7 +319,13 @@ const steps = {
 
 module.exports = {
   async isApplicable(context) {
-    const { configuration, history, options } = context;
+    const { configuration, history, options, serviceDir } = context;
+
+    if (!serviceDir) {
+      context.inapplicabilityReasonCode = 'NOT_IN_SERVICE_DIRECTORY';
+      return false;
+    }
+
     if (
       _.get(configuration, 'provider') !== 'aws' &&
       _.get(configuration, 'provider.name') !== 'aws'
diff --git a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
index ba793afa5c3..c813658d569 100644
--- a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
+++ b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
@@ -57,7 +57,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
   it('Should be ineffective, when not at service path', async () => {
     const context = {};
     expect(await step.isApplicable(context)).to.equal(false);
-    expect(context.inapplicabilityReasonCode).to.equal('NON_AWS_PROVIDER');
+    expect(context.inapplicabilityReasonCode).to.equal('NOT_IN_SERVICE_DIRECTORY');
   });
 
   it('Should be ineffective, when not at AWS service', async () => {