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 9ab4d6bc59..39334ac64a 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
@@ -723,7 +723,13 @@
                         } else {
                             parameterCombo.combo('setSelectedOption', initialOption);
                         }
+                    } else {
+                        // select the first option
+                        allowableValuesCombo.combo('setSelectedOption', allowableValueOptions[0]);
                     }
+                } else {
+                    // select the first option
+                    allowableValuesCombo.combo('setSelectedOption', allowableValueOptions[0]);
                 }
             };