diff --git a/src/templates/default/module/server/server/update.tpl.html b/src/templates/default/module/server/server/update.tpl.html
index 16f9e517..6c0da6b5 100644
--- a/src/templates/default/module/server/server/update.tpl.html
+++ b/src/templates/default/module/server/server/update.tpl.html
@@ -49,8 +49,8 @@
 			<div class="form-group types typeService">
 				<label for="protocol">{{ label_protocol }}</label>
 				<select id="protocol" name="protocol" class="custom-select">
-					<option {% if not edit_value_protocol %}selected {% endif %} disabled>{{ label_please_select }}</option>
-					<option {% if edit_value_protocol|lower=='tcp' %}selected {% endif %}value="tcp">TCP</option>
+					<!-- Lets assume TCP by default, no need for js to autoselect as some ports can be UDP or TCP -->
+					<option {% if not edit_value_protocol %}selected {% elseif edit_value_protocol|lower=='tcp' %}selected {% endif %}value="tcp">TCP</option>
 					<option {% if edit_value_protocol|lower=='udp' %}selected {% endif %}value="udp">UDP</option>
 				</select>
 			</div>