diff --git a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js
index e67a44a0b6..19e98d7ca3 100644
--- a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js
+++ b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js
@@ -117,7 +117,7 @@ function multiCredentialModalController(GetBasePath, qs, MultiCredentialService)
         }));
 
         const watchType = scope.$watch('credentialType', (newValue, oldValue) => {
-            if (newValue !== oldValue) {
+            if (newValue && newValue !== oldValue) {
                 fetchCredentials(parseInt(newValue));
             }
         });