diff --git a/src/core/settings.c b/src/core/settings.c
index 6fd046f15..e80355c70 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -1798,6 +1798,14 @@ struct setting hostname_setting __setting ( SETTING_HOST ) = {
 	.type = &setting_type_string,
 };
 
+/** TFTP server setting */
+struct setting next_server_setting __setting ( SETTING_BOOT ) = {
+	.name = "next-server",
+	.description = "TFTP server",
+	.tag = DHCP_EB_SIADDR,
+	.type = &setting_type_ipv4,
+};
+
 /** Filename setting */
 struct setting filename_setting __setting ( SETTING_BOOT ) = {
 	.name = "filename",
diff --git a/src/net/udp/tftp.c b/src/net/udp/tftp.c
index 7cd211e41..a2d6473c3 100644
--- a/src/net/udp/tftp.c
+++ b/src/net/udp/tftp.c
@@ -1214,14 +1214,6 @@ struct uri_opener mtftp_uri_opener __uri_opener = {
  ******************************************************************************
  */
 
-/** TFTP server setting */
-struct setting next_server_setting __setting ( SETTING_BOOT ) = {
-	.name = "next-server",
-	.description = "TFTP server",
-	.tag = DHCP_EB_SIADDR,
-	.type = &setting_type_ipv4,
-};
-
 /**
  * Apply TFTP configuration settings
  *