diff --git a/awx/ui/client/src/templates/job-template.form.js b/awx/ui/client/src/templates/job-template.form.js
index bf0e911b65..5a3d5e0754 100644
--- a/awx/ui/client/src/templates/job-template.form.js
+++ b/awx/ui/client/src/templates/job-template.form.js
@@ -332,8 +332,7 @@ function(NotificationsList, CompletedJobsList, i18n) {
                         dataTitle: i18n._('Store Ansible Facts'),
                         dataContainer: "body",
                         labelClass: 'stack-inline',
-                        ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)',
-                        ngShow: "!job_type.value || job_type.value === 'run'"
+                        ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
                     }]
                 },
                 callback_url: {
diff --git a/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js b/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
index f5b640c528..735dc4d421 100644
--- a/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
+++ b/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
@@ -413,10 +413,6 @@
                     $scope.survey_enabled = false;
                 }
 
-                if($scope.job_type.value !== "run") {
-                    $scope.store_facts = null;
-                }
-
                 generator.clearApiErrors($scope);
 
                 Wait('start');