diff --git a/net/nut/files/nut-service.sh.functions b/net/nut/files/nut-service.sh.functions
index fda69ce608..7ca0da4f15 100644
--- a/net/nut/files/nut-service.sh.functions
+++ b/net/nut/files/nut-service.sh.functions
@@ -210,7 +210,6 @@ find_statepath() {
 	local nut_value_via_foreach=""
 
 	find_foreach_value "$section_type" "$package" statepath "$NUT_BASE_STATEPATH" || return 1
-	[ -n "$nut_value_via_foreach" ] || nut_value_via_foreach="$NUT_BASE_STATEPATH"
 
 	# shellcheck disable=2034
 	STATEPATH="$nut_value_via_foreach"
@@ -299,7 +298,7 @@ interface_triggers() {
 			for interface in $interfaces; do
 				# We use the variadic third and fourth parameters of procd_add_interface_trigger to
 				# restart instead of reload on interface up/down events. Additionally the variadic
-				# fifth and parameters of procd_add_interface_trigger are passed through to
+				# fifth and following parameters of procd_add_interface_trigger are passed through to
 				# the <script>, so the trigger action becomes e.g. /etc/init.d/<script> restart <variadic_vars>.
 				procd_add_interface_trigger "interface.*.up" "$interface" "/etc/init.d/$initscript" "restart" "$@" || trigger_failed="true"
 			done
diff --git a/net/nut/files/nut_monitor b/net/nut/files/nut_monitor
index 088cd7bdef..c27f709e17 100644
--- a/net/nut/files/nut_monitor
+++ b/net/nut/files/nut_monitor
@@ -33,8 +33,8 @@
 #	option forcessl 0
 #	option debugmin 0
 #	option defaultnotify SYSLOG
-# option interface_reload_delay 3000 # in milliseconds
-# option triggerlist all # not configured by default
+#	option interface_reload_delay 3000 # in milliseconds
+#	option triggerlist all # not configured by default
 
 #config monitor
 #	option type primary
diff --git a/net/nut/files/nut_server b/net/nut/files/nut_server
index 9d62f63ea1..b45062b61a 100644
--- a/net/nut/files/nut_server
+++ b/net/nut/files/nut_server
@@ -39,4 +39,4 @@
 #	option interface_reload_delay 3000 # in milliseconds
 # NB: certificates only apply to SSL-enabled version
 #	option certfile /usr/local/etc/upsd.pem
-# option triggerlist all # not configured by default
+#	option triggerlist all # not configured by default