diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
index 5fa3b224b4..355d7a3048 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
@@ -768,8 +768,8 @@
                 if (parametersSupported && _.isUndefined(selectedValue)) {
                     selectedOption = parameterCombo.combo('getSelectedOption');
 
-                    // if the parameters are still loading, revert to the initial value, otherwise use the selected parameter
-                    if (selectedOption === LOADING_PARAMETERS_OPTION) {
+                    // if there are no parameters, or they are still loading, revert to the initial value otherwise use the selected parameter
+                    if (_.isUndefined(selectedOption) || selectedOption === LOADING_PARAMETERS_OPTION) {
                         selectedValue = initialValue;
                     } else {
                         selectedValue = selectedOption.value;