diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
index bc9b157f27..cccadcd2c6 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
@@ -58,14 +58,14 @@ nf.ControllerService = (function () {
      * that needs to be saved.
      */
     var isSaveRequired = function () {
-        var details = $('#controller-service-configuration').data('controllerServiceDetails');
+        var entity = $('#controller-service-configuration').data('controllerServiceDetails');
 
         // determine if any controller service settings have changed
 
-        if ($('#controller-service-name').val() !== details['name']) {
+        if ($('#controller-service-name').val() !== entity.component['name']) {
             return true;
         }
-        if ($('#controller-service-comments').val() !== details['comments']) {
+        if ($('#controller-service-comments').val() !== entity.component['comments']) {
             return true;
         }
 
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js
index 7a2540d467..b3a8745c03 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js
@@ -65,25 +65,25 @@ nf.ReportingTask = (function () {
      * that needs to be saved.
      */
     var isSaveRequired = function () {
-        var details = $('#reporting-task-configuration').data('reportingTaskDetails');
+        var entity = $('#reporting-task-configuration').data('reportingTaskDetails');
 
         // determine if any reporting task settings have changed
 
-        if ($('#reporting-task-name').val() !== details.name) {
+        if ($('#reporting-task-name').val() !== entity.component['name']) {
             return true;
         }
-        if ($('#reporting-task-comments').val() !== details['comments']) {
+        if ($('#reporting-task-comments').val() !== entity.component['comments']) {
             return true;
         }
-        if ($('#reporting-task-enabled').hasClass('checkbox-checked') && details['state'] === 'DISABLED') {
+        if ($('#reporting-task-enabled').hasClass('checkbox-checked') && entity.component['state'] === 'DISABLED') {
             return true;
-        } else if ($('#reporting-task-enabled').hasClass('checkbox-unchecked') && (details['state'] === 'RUNNING' || details['state'] === 'STOPPED')) {
+        } else if ($('#reporting-task-enabled').hasClass('checkbox-unchecked') && (entity.component['state'] === 'RUNNING' || entity.component['state'] === 'STOPPED')) {
             return true;
         }
 
         // consider the scheduling strategy
         var schedulingStrategy = $('#reporting-task-scheduling-strategy-combo').combo('getSelectedOption').value;
-        if (schedulingStrategy !== (details['schedulingStrategy'] + '')) {
+        if (schedulingStrategy !== (entity.component['schedulingStrategy'] + '')) {
             return true;
         }
 
@@ -96,7 +96,7 @@ nf.ReportingTask = (function () {
         }
 
         // check the scheduling period
-        if (nf.Common.isDefinedAndNotNull(schedulingPeriod) && schedulingPeriod.val() !== (details['schedulingPeriod'] + '')) {
+        if (nf.Common.isDefinedAndNotNull(schedulingPeriod) && schedulingPeriod.val() !== (entity.component['schedulingPeriod'] + '')) {
             return true;
         }