diff --git a/net-mgmt/zabbix4-proxy/Makefile b/net-mgmt/zabbix4-proxy/Makefile
index b8da74ab5..9ea04a757 100644
--- a/net-mgmt/zabbix4-proxy/Makefile
+++ b/net-mgmt/zabbix4-proxy/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		zabbix4-proxy
-PLUGIN_VERSION=		1.0
-PLUGIN_REVISION=        1
+PLUGIN_VERSION=		1.1
 PLUGIN_COMMENT=		Zabbix Proxy enables decentralized monitoring
 PLUGIN_DEPENDS=		zabbix4-proxy
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net-mgmt/zabbix4-proxy/pkg-descr b/net-mgmt/zabbix4-proxy/pkg-descr
index d18a4485b..1341fd8be 100644
--- a/net-mgmt/zabbix4-proxy/pkg-descr
+++ b/net-mgmt/zabbix4-proxy/pkg-descr
@@ -8,3 +8,11 @@ excellent reporting and data visualisation features based on the stored
 data. This makes Zabbix ideal for capacity planning.
 
 WWW: http://www.zabbix.com/
+
+Plugin Changelog
+----------------
+
+1.1
+
+* Add ProxyOfflineBuffer parameter
+* Switch to new service control UI
diff --git a/net-mgmt/zabbix4-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml b/net-mgmt/zabbix4-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml
index e680d0b3f..413011a34 100644
--- a/net-mgmt/zabbix4-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml
+++ b/net-mgmt/zabbix4-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml
@@ -107,6 +107,12 @@
         <type>text</type>
         <help>Size of history index cache in bytes. Shared memory size for indexing history cache. Range: 128K-2G</help>
     </field>
+    <field>
+        <id>general.proxyofflinebuffer</id>
+        <label>Proxy Offline Buffer</label>
+        <type>text</type>
+        <help>Set the time in hours how long the values will be buffered when the server is unreachable.</help>
+    </field>
     <field>
         <id>general.timeout</id>
         <label>Timeout</label>
diff --git a/net-mgmt/zabbix4-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml b/net-mgmt/zabbix4-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml
index 7ae8c38eb..fe99a67fa 100644
--- a/net-mgmt/zabbix4-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml
+++ b/net-mgmt/zabbix4-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/zabbixproxy/general</mount>
     <description>Zabbix Proxy configuration</description>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -75,6 +75,12 @@
             <default>4M</default>
             <Required>N</Required>
         </historyindexcachesize>
+        <proxyofflinebuffer type="IntegerField">
+            <Required>N</Required>
+            <MinimumValue>1</MinimumValue>
+            <MaximumValue>720</MaximumValue>
+            <ValidationMessage>Set a number between 1 and 720.</ValidationMessage>
+        </proxyofflinebuffer>
         <timeout type="IntegerField">
             <default>4</default>
             <Required>N</Required>
diff --git a/net-mgmt/zabbix4-proxy/src/opnsense/mvc/app/views/OPNsense/Zabbixproxy/general.volt b/net-mgmt/zabbix4-proxy/src/opnsense/mvc/app/views/OPNsense/Zabbixproxy/general.volt
index 82d82ad20..0d5bef383 100644
--- a/net-mgmt/zabbix4-proxy/src/opnsense/mvc/app/views/OPNsense/Zabbixproxy/general.volt
+++ b/net-mgmt/zabbix4-proxy/src/opnsense/mvc/app/views/OPNsense/Zabbixproxy/general.volt
@@ -41,20 +41,19 @@ POSSIBILITY OF SUCH DAMAGE.
             formatTokenizersUI();
             $('.selectpicker').selectpicker('refresh');
         });
-        ajaxCall(url="/api/zabbixproxy/service/status", sendData={}, callback=function(data,status) {
-            updateServiceStatusUI(data['status']);
-        });
+
+        updateServiceControlUI('zabbixproxy');
 
         // link save button to API set action
         $("#saveAct").click(function(){
             saveFormToEndpoint(url="/api/zabbixproxy/general/set", formid='frm_general_settings',callback_ok=function(){
-                    $("#saveAct_progress").addClass("fa fa-spinner fa-pulse");
-                    ajaxCall(url="/api/zabbixproxy/service/reconfigure", sendData={}, callback=function(data,status) {
-                            ajaxCall(url="/api/zabbixproxy/service/status", sendData={}, callback=function(data,status) {
-                                    updateServiceStatusUI(data['status']);
-                            });
-                            $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse");
-                    });
+                $("#saveAct_progress").addClass("fa fa-spinner fa-pulse");
+                ajaxCall(url="/api/zabbixproxy/service/reconfigure", sendData={}, callback=function(data,status) {
+                    ajaxCall(url="/api/zabbixproxy/service/status", sendData={}, callback=function(data,status) {
+                        updateServiceControlUI('zabbixproxy');
+                        });
+                        $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse");
+                });
             });
         });
     });
diff --git a/net-mgmt/zabbix4-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf b/net-mgmt/zabbix4-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf
index 59501face..78371ec2a 100644
--- a/net-mgmt/zabbix4-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf
+++ b/net-mgmt/zabbix4-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf
@@ -23,6 +23,9 @@ SourceIP={{ OPNsense.zabbixproxy.general.sourceip }}
 LogFile=/var/log/zabbix_proxy.log
 PidFile=/var/run/zabbix/zabbix_proxy.pid
 DBName=/var/db/zabbix/zabbix_proxy.db
+{% if helpers.exists('OPNsense.zabbixproxy.general.proxyofflinebuffer') and OPNsense.zabbixproxy.general.proxyofflinebuffer != '' %}
+ProxyOfflineBuffer={{ OPNsense.zabbixproxy.general.proxyofflinebuffer }}
+{% endif %}
 {% if helpers.exists('OPNsense.zabbixproxy.general.startpollers') and OPNsense.zabbixproxy.general.startpollers != '' %}
 StartPollers={{ OPNsense.zabbixproxy.general.startpollers }}
 {% endif %}