diff --git a/CHANGELOG b/CHANGELOG
index 70e1a90b30..5003ed0d66 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Cacti CHANGELOG
 
 1.2.25
+-issue#5254: Created a data source template to specify the snmp port, but it doesn't seem to work properly
 -issue#5255: Data query xml path with space problem
 -issue#5258: Warnings occur when installing thold plugin and as such thold will not upgrade correctly
 -issue#5259: When the Data Template contains more Data Sources than the Graph Template RRDfiles won't update
diff --git a/lib/utility.php b/lib/utility.php
index 17610e2c0d..b3043cb255 100644
--- a/lib/utility.php
+++ b/lib/utility.php
@@ -766,7 +766,9 @@ 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 as 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;