diff --git a/src/opnsense/www/js/opnsense.js b/src/opnsense/www/js/opnsense.js
index db8aa830f..bec98fb47 100644
--- a/src/opnsense/www/js/opnsense.js
+++ b/src/opnsense/www/js/opnsense.js
@@ -135,13 +135,13 @@ function setFormData(parent,data) {
                     // data node found, handle per type
                     if (targetNode.is("select")) {
                         // handle select boxes
-                        targetNode.empty(); // flush
-                        if (targetNode.hasClass("tokenize")) {
+                        if (targetNode.find('option').length > 0 && targetNode.hasClass("tokenize")) {
                             // when setting the same content twice to a widget, tokenize2 sorting mixes up.
                             // Ideally formatTokenizersUI() or tokenize2 should handle this better, but for now
                             // this seems like the only fix that actually works.
                             targetNode.tokenize2().trigger('tokenize:clear');
                         }
+                        targetNode.empty(); // flush
                         $.each(node[keypart],function(indxItem, keyItem){
                             var opt = $("<option>").val(htmlDecode(indxItem)).text(keyItem["value"]);
                             if (keyItem["selected"] != "0") {