diff --git a/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.jsx b/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.jsx
index 868878832a..c5df022772 100644
--- a/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.jsx
+++ b/awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.jsx
@@ -43,7 +43,7 @@ function CredentialAdd({ me }) {
 
         possibleFields.forEach(field => {
           const input = inputs[field.id];
-          if (input.credential && input.inputs) {
+          if (input?.credential && input?.inputs) {
             pluginInputs[field.id] = input;
           } else if (passwordPrompts[field.id]) {
             nonPluginInputs[field.id] = 'ASK';
diff --git a/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.jsx b/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.jsx
index 0cb78ed75e..83e64e81f8 100644
--- a/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.jsx
+++ b/awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.jsx
@@ -39,7 +39,7 @@ function CredentialEdit({ credential, me }) {
 
         possibleFields.forEach(field => {
           const input = inputs[field.id];
-          if (input.credential && input.inputs) {
+          if (input?.credential && input?.inputs) {
             pluginInputs[field.id] = input;
           } else if (passwordPrompts[field.id]) {
             nonPluginInputs[field.id] = 'ASK';