diff --git a/src/System Application/App/MicrosoftGraph/src/Authorization/GraphAuthClientCredentials.Codeunit.al b/src/System Application/App/MicrosoftGraph/src/Authorization/GraphAuthClientCredentials.Codeunit.al
index 47e580cfd6..d5e2bc871b 100644
--- a/src/System Application/App/MicrosoftGraph/src/Authorization/GraphAuthClientCredentials.Codeunit.al	
+++ b/src/System Application/App/MicrosoftGraph/src/Authorization/GraphAuthClientCredentials.Codeunit.al	
@@ -14,17 +14,11 @@ codeunit 9357 "Graph Auth. Client Credentials" implements "Graph Authorization"
 
     var
         ClientCredentialsTokenAuthorityUrlTxt: Label 'https://login.microsoftonline.com/%1/oauth2/v2.0/token', Comment = '%1 = AAD tenant ID', Locked = true;
-        [NonDebuggable]
         Scopes: List of [Text];
-        [NonDebuggable]
         ClientSecret: SecretText;
-        [NonDebuggable]
         AadTenantId: Text;
-        [NonDebuggable]
-        [NonDebuggable]
         ClientId: Text;
 
-    [NonDebuggable]
     procedure SetParameters(NewAadTenantId: Text; NewClientId: Text; NewClientSecret: SecretText; NewScopes: List of [Text])
     begin
         AadTenantId := NewAadTenantId;
diff --git a/src/System Application/App/MicrosoftGraph/src/GraphClient.Codeunit.al b/src/System Application/App/MicrosoftGraph/src/GraphClient.Codeunit.al
index e3afa0b693..725be69c6b 100644
--- a/src/System Application/App/MicrosoftGraph/src/GraphClient.Codeunit.al	
+++ b/src/System Application/App/MicrosoftGraph/src/GraphClient.Codeunit.al	
@@ -17,7 +17,6 @@ codeunit 9350 "Graph Client"
     InherentPermissions = X;
 
     var
-        [NonDebuggable]
         GraphClientImpl: Codeunit "Graph Client Impl.";
 
     /// <summary>