diff --git a/CHANGELOG b/CHANGELOG
index 7c28b7a33..381d7c59b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -58,6 +58,7 @@ Cacti CHANGELOG
 -feature: Upgrade d3.js to version 7.8.2
 
 1.2.25
+-issue#5254: Created a data source template to specify the snmp port, but it doesn't seem to work properly
 -issue#5275: Boost stats can display odd values when running
 -issue#5277: Boost should not attempt to start if there are no poller_output_boost records
 -issue#5279: Rebuild poller cache does not work as expected
diff --git a/lib/utility.php b/lib/utility.php
index a7d4b7579..176e40a96 100644
--- a/lib/utility.php
+++ b/lib/utility.php
@@ -769,7 +769,10 @@ function push_out_host($host_id, $local_data_id = 0, $data_template_id = 0) {
 						$field = 'id';
 					}
 
-					if (preg_match('/^' . VALID_HOST_FIELDS . '$/i', $template_field['type_code']) && $template_field['t_value'] != 'on') {
+					// Only override if the template value is null at this point
+					if (preg_match('/^' . VALID_HOST_FIELDS . '$/i', $template_field['type_code']) &&
+						$template_field['t_value'] != 'on' && $template_field['value'] == '') {
+
 						// It's a valid host type-code
 						$update = true;