diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index c4f0001d3..fa38e96c0 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		collectd
-PLUGIN_VERSION=		1.1
+PLUGIN_VERSION=		1.2
 PLUGIN_COMMENT=		Collect system and application performance metrics periodically
 PLUGIN_DEPENDS=		collectd5
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/General.xml b/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/General.xml
index c7dc384c1..9dd07f44a 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/General.xml
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/General.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/collectd/general</mount>
     <description>Collectd configuration</description>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -9,7 +9,7 @@
         </enabled>
         <hostname type="TextField">
             <default></default>
-            <Required>Y</Required>
+            <Required>N</Required>
 	    <mask>/^.{1,64}$/u</mask>
         </hostname>
         <fqdnlookup type="BooleanField">
diff --git a/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/collectd.conf b/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/collectd.conf
index 81e978114..b91d93af7 100644
--- a/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/collectd.conf
+++ b/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/collectd.conf
@@ -2,6 +2,8 @@
 
 {% if helpers.exists('OPNsense.collectd.general.hostname') and OPNsense.collectd.general.hostname != '' %}
 Hostname    "{{ OPNsense.collectd.general.hostname }}"
+{% else %}
+Hostname    "{{ system.hostname }}"
 {% endif %}
 {% if helpers.exists('OPNsense.collectd.general.fqdnlookup') and OPNsense.collectd.general.fqdnlookup == '1' %}
 FQDNLookup    true