diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
index 8d63295196..1ac83b4211 100644
--- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
@@ -139,9 +139,13 @@ function JobTemplateForm({
 
   const handleProjectUpdate = useCallback(
     newProject => {
+      if (project?.id !== newProject?.id) {
+        // Clear the selected playbook value when a different project is selected or
+        // when the project is deselected.
+        playbookHelpers.setValue(0);
+      }
       setProject(newProject);
       projectHelpers.setValue(newProject);
-      playbookHelpers.setValue(0);
       scmHelpers.setValue('');
     },
     [] // eslint-disable-line react-hooks/exhaustive-deps