diff --git a/src/extension/debugger/configuration/resolvers/attach.ts b/src/extension/debugger/configuration/resolvers/attach.ts
index 115e4627..12fffe8f 100644
--- a/src/extension/debugger/configuration/resolvers/attach.ts
+++ b/src/extension/debugger/configuration/resolvers/attach.ts
@@ -43,7 +43,10 @@ export class AttachConfigurationResolver extends BaseConfigurationResolver<Attac
             debugConfiguration.host = 'localhost';
         }
         if (debugConfiguration.justMyCode === undefined) {
-            debugConfiguration.justMyCode = getConfiguration('debugpy').get<boolean>('debugJustMyCode', true);
+            debugConfiguration.justMyCode = getConfiguration('debugpy', workspaceFolder).get<boolean>(
+                'debugJustMyCode',
+                true,
+            );
         }
         debugConfiguration.showReturnValue = debugConfiguration.showReturnValue !== false;
         // Pass workspace folder so we can get this when we get debug events firing.
diff --git a/src/extension/debugger/configuration/resolvers/launch.ts b/src/extension/debugger/configuration/resolvers/launch.ts
index d2521087..5230637b 100644
--- a/src/extension/debugger/configuration/resolvers/launch.ts
+++ b/src/extension/debugger/configuration/resolvers/launch.ts
@@ -103,7 +103,10 @@ export class LaunchConfigurationResolver extends BaseConfigurationResolver<Launc
             debugConfiguration.debugOptions = [];
         }
         if (debugConfiguration.justMyCode === undefined) {
-            debugConfiguration.justMyCode = getConfiguration('debugpy').get<boolean>('debugJustMyCode', true);
+            debugConfiguration.justMyCode = getConfiguration('debugpy', workspaceFolder).get<boolean>(
+                'debugJustMyCode',
+                true,
+            );
         }
         // Pass workspace folder so we can get this when we get debug events firing.
         debugConfiguration.workspaceFolder = workspaceFolder ? workspaceFolder.fsPath : undefined;
diff --git a/src/test/unittest/configuration/resolvers/attach.unit.test.ts b/src/test/unittest/configuration/resolvers/attach.unit.test.ts
index 97241da1..9fe63d2f 100644
--- a/src/test/unittest/configuration/resolvers/attach.unit.test.ts
+++ b/src/test/unittest/configuration/resolvers/attach.unit.test.ts
@@ -53,7 +53,7 @@ getInfoPerOS().forEach(([osName, osType, path]) => {
             getWorkspaceFoldersStub = sinon.stub(vscodeapi, 'getWorkspaceFolders');
             getOSTypeStub.returns(osType);
             getConfigurationStub = sinon.stub(vscodeapi, 'getConfiguration');
-            getConfigurationStub.withArgs('debugpy').returns(createMoqConfiguration(true));
+            getConfigurationStub.withArgs('debugpy', sinon.match.any).returns(createMoqConfiguration(true));
         });
 
         teardown(() => {
@@ -554,7 +554,9 @@ getInfoPerOS().forEach(([osName, osType, path]) => {
                     .slice()
                     .concat(DebugOptions.Jinja, DebugOptions.Sudo) as DebugOptions[];
 
-                getConfigurationStub.withArgs('debugpy').returns(createMoqConfiguration(testParams.justMyCodeSetting));
+                getConfigurationStub
+                    .withArgs('debugpy', sinon.match.any)
+                    .returns(createMoqConfiguration(testParams.justMyCodeSetting));
                 const debugConfig = await resolveDebugConfiguration(workspaceFolder, {
                     ...attach,
                     debugOptions,
diff --git a/src/test/unittest/configuration/resolvers/launch.unit.test.ts b/src/test/unittest/configuration/resolvers/launch.unit.test.ts
index 200cccbf..b2dd2e1a 100644
--- a/src/test/unittest/configuration/resolvers/launch.unit.test.ts
+++ b/src/test/unittest/configuration/resolvers/launch.unit.test.ts
@@ -51,7 +51,7 @@ getInfoPerOS().forEach(([osName, osType, path]) => {
             getEnvFileStub = sinon.stub(settings, 'getEnvFile');
             getDebugEnvironmentVariablesStub = sinon.stub(helper, 'getDebugEnvironmentVariables');
             getConfigurationStub = sinon.stub(vscodeapi, 'getConfiguration');
-            getConfigurationStub.withArgs('debugpy').returns(createMoqConfiguration(true));
+            getConfigurationStub.withArgs('debugpy', sinon.match.any).returns(createMoqConfiguration(true));
         });
 
         teardown(() => {
@@ -792,7 +792,9 @@ getInfoPerOS().forEach(([osName, osType, path]) => {
                 const pythonFile = 'xyz.py';
                 setupIoc(pythonPath);
                 setupActiveEditor(pythonFile, PYTHON_LANGUAGE);
-                getConfigurationStub.withArgs('debugpy').returns(createMoqConfiguration(testParams.justMyCodeSetting));
+                getConfigurationStub
+                    .withArgs('debugpy', sinon.match.any)
+                    .returns(createMoqConfiguration(testParams.justMyCodeSetting));
                 const debugConfig = await resolveDebugConfiguration(workspaceFolder, {
                     ...launch,
                     justMyCode: testParams.justMyCode,