diff --git a/net-mgmt/telegraf/pkg-descr b/net-mgmt/telegraf/pkg-descr
index a98a0c459..9f80fd1b2 100644
--- a/net-mgmt/telegraf/pkg-descr
+++ b/net-mgmt/telegraf/pkg-descr
@@ -11,6 +11,9 @@ WWW: https://www.influxdata.com/time-series-platform/telegraf/
 
 Plugin Changelog
 ================
+1.12.6
+
+* Add Influx v2 flush timeout
 
 1.12.6
 
diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/output.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/output.xml
index b627fa1e6..2ea1ee342 100644
--- a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/output.xml
+++ b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/output.xml
@@ -77,6 +77,12 @@
         <type>checkbox</type>
         <help>This will skip chain and host verification.</help>
     </field>
+    <field>
+        <id>output.influx_v2_timeout</id>
+        <label>Timeout</label>
+        <type>text</type>
+        <help>Flush timeout for the v2 Telegraf output in seconds, formatted as a string. If not provided, will default to 5. 0 means no timeout, but is not recommended. Increase if you get timeout errors.</help>
+    </field>
     <field>
         <id>output.graphite_enable</id>
         <label>Enable Graphite Output</label>
diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml
index 404bd8ddf..46015f226 100644
--- a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml
+++ b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml
@@ -123,6 +123,10 @@
             <default>0</default>
             <Required>N</Required>
         </influx_v2_insecure_skip_verify>
+        <influx_v2_timeout type="IntegerField">
+            <default>5</default>
+            <Required>N</Required>
+        </influx_v2_timeout>
         <datadog_enable type="BooleanField">
             <default>0</default>
             <Required>N</Required>
diff --git a/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf.conf b/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf.conf
index 6991423d1..489aadf80 100644
--- a/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf.conf
+++ b/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf.conf
@@ -176,6 +176,9 @@
   insecure_skip_verify = false
 {%   endif %}
 {% endif %}
+{%   if helpers.exists('OPNsense.telegraf.output.influx_v2_timeout') and OPNsense.telegraf.output.influx_v2_timeout != '' %}
+  timeout = "{{ OPNsense.telegraf.output.influx_v2_timeout }}s"
+{%   endif %}
 
 {% if helpers.exists('OPNsense.telegraf.input.cpu') and OPNsense.telegraf.input.cpu == '1' %}
 [[inputs.cpu]]