diff --git a/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/ServiceAccountJwtAwsClientImpl.java b/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/ServiceAccountJwtAwsClientImpl.java
index edaf0f28d2ad6aa22de54c609a67ea5118c3e82b..21e1efe20b86c6a004830f3b1f63b8b481cc2eff 100644
--- a/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/ServiceAccountJwtAwsClientImpl.java
+++ b/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/ServiceAccountJwtAwsClientImpl.java
@@ -101,22 +101,9 @@ public class ServiceAccountJwtAwsClientImpl implements IServiceAccountJwtClient
             GetParameterRequest paramRequest = new GetParameterRequest()
                     .withName(client_credentials_client_id)
                     .withWithDecryption(true);
-            GetParameterResult paramResult = new GetParameterResult();
-            paramResult = ssmManager.getParameter(paramRequest);
-            List<Parameter> paramsResultList = new ArrayList<>();
-            List<String> paramsResultListInvalid = new ArrayList<>();
-            paramsResultList = paramResult.getParameters();
-            paramsResultListInvalid = paramResult.getInvalidParameters();
-
-            if(paramsResultListInvalid.size() >0)
-            {
-                log.error("Notification Service: SSM did not retrieve all parameters");
-            }
-            for (Parameter s : paramsResultList) {
-                if (s.getName().equalsIgnoreCase(client_credentials_client_id)) {
-                    client_credentials_clientid = s.getValue();
-                }
-            }
+            GetParameterResult paramResult = ssmManager.getParameter(paramRequest);
+            Parameter paramsResult = paramResult.getParameter();
+           client_credentials_clientid = paramsResult.getValue();
             client_credentials_secret = getSecret(client_secret_secretName,amazonRegion,client_secret_key);