diff --git a/awx/ui/client/features/credentials/legacy.credentials.js b/awx/ui/client/features/credentials/legacy.credentials.js
index b4af6fea24..d26822fd7b 100644
--- a/awx/ui/client/features/credentials/legacy.credentials.js
+++ b/awx/ui/client/features/credentials/legacy.credentials.js
@@ -18,8 +18,6 @@ function LegacyCredentialsService (pathService) {
             },
             'list@credentials': {
                 templateProvider: function(CredentialList, generateList) {
-                    CredentialList.iterator = 'credential';
-
                     let html = generateList.build({
                         list: CredentialList,
                         mode: 'edit'
diff --git a/awx/ui/client/src/shared/stateDefinitions.factory.js b/awx/ui/client/src/shared/stateDefinitions.factory.js
index e4af7aeb51..b473e17426 100644
--- a/awx/ui/client/src/shared/stateDefinitions.factory.js
+++ b/awx/ui/client/src/shared/stateDefinitions.factory.js
@@ -738,8 +738,9 @@ function($injector, $stateExtender, $log, i18n) {
                     },
                     resolve: {
                         ListDefinition: [field.list, function(list) {
-                            list.iterator = field.sourceModel;
-                            return list;
+                            let listClone = _.cloneDeep(list);
+                            listClone.iterator = field.sourceModel;
+                            return listClone;
                         }],
                         OrganizationId: ['ListDefinition', 'InventoriesService', '$stateParams', '$rootScope',
                             function(list, InventoriesService, $stateParams, $rootScope){