diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 1f80edd56..01ba76a22 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		nginx
 PLUGIN_VERSION=		1.29
+PLUGIN_REVISION=	1
 PLUGIN_COMMENT=		Nginx HTTP server and reverse proxy
 PLUGIN_DEPENDS=		nginx
 PLUGIN_MAINTAINER=	franz.fabian.94@gmail.com
diff --git a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Migrations/M1_24_0.php b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Migrations/M1_24_0.php
index ef2817157..1bdb90728 100644
--- a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Migrations/M1_24_0.php
+++ b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Migrations/M1_24_0.php
@@ -41,7 +41,7 @@ class M1_24_0 extends BaseModelMigration
     {
         $cfgObj = Config::getInstance()->object();
         $ports = array();
-        foreach ($cfgObj->OPNsense->Nginx->http_server as $cfg_http_server) {
+        foreach ($cfgObj->OPNsense->Nginx->http_server ?? [] as $cfg_http_server) {
             $uuid = (string)$cfg_http_server->attributes()['uuid'];
             $ports['http_port'] = (isset($cfg_http_server->listen_http_port) && $cfg_http_server->listen_http_port != '') ? $cfg_http_server->listen_http_port : null;
             $ports['https_port'] = (isset($cfg_http_server->listen_https_port) && $cfg_http_server->listen_https_port != '') ? $cfg_http_server->listen_https_port : null;
@@ -49,7 +49,7 @@ class M1_24_0 extends BaseModelMigration
             $http_server->listen_http_address = (isset($ports['http_port'])) ? $ports['http_port'] . ',[::]:' . $ports['http_port'] : null;
             $http_server->listen_https_address = (isset($ports['https_port'])) ? $ports['https_port'] . ',[::]:' . $ports['https_port'] : null;
         }
-        foreach ($cfgObj->OPNsense->Nginx->stream_server as $cfg_stream_server) {
+        foreach ($cfgObj->OPNsense->Nginx->stream_server ?? [] as $cfg_stream_server) {
             $uuid = (string)$cfg_stream_server->attributes()['uuid'];
             $port = (isset($cfg_stream_server->listen_port) && $cfg_stream_server->listen_port != '') ? $cfg_stream_server->listen_port : null;
             $server = $model->getNodeByReference('stream_server.' . $uuid);
diff --git a/www/nginx/src/opnsense/scripts/nginx/setup.php b/www/nginx/src/opnsense/scripts/nginx/setup.php
index 744250104..f700a23e4 100755
--- a/www/nginx/src/opnsense/scripts/nginx/setup.php
+++ b/www/nginx/src/opnsense/scripts/nginx/setup.php
@@ -318,3 +318,5 @@ file_put_contents(
     empty($tls_fingerprint_database) ? '{}' :  json_encode($tls_fingerprint_database)
 );
 chmod('/usr/local/etc/nginx/tls_fingerprints.json', 0644);
+
+passthru('/usr/local/etc/rc.d/php-fpm start');
diff --git a/www/nginx/src/opnsense/service/conf/actions.d/actions_nginx.conf b/www/nginx/src/opnsense/service/conf/actions.d/actions_nginx.conf
index ed34d4971..2107624ea 100644
--- a/www/nginx/src/opnsense/service/conf/actions.d/actions_nginx.conf
+++ b/www/nginx/src/opnsense/service/conf/actions.d/actions_nginx.conf
@@ -1,5 +1,5 @@
 [start]
-command:/usr/local/opnsense/scripts/nginx/setup.php;/usr/local/etc/rc.d/php-fpm start;/usr/local/etc/rc.d/nginx start
+command:/usr/local/etc/rc.d/nginx start
 parameters:
 type:script
 message:starting nginx
@@ -11,18 +11,19 @@ type:script
 message:stopping nginx
 
 [restart]
-command:/usr/local/opnsense/scripts/nginx/setup.php;/usr/local/etc/rc.d/php-fpm restart;/usr/local/etc/rc.d/nginx restart
+command:/usr/local/etc/rc.d/nginx restart
 parameters:
 type:script
 message:restarting nginx
 
-[status]
-command:/usr/local/etc/rc.d/nginx status;exit 0
+[reload]
+command:/usr/local/etc/rc.d/nginx reload
 parameters:
-type:script_output
+type:script
+message:reloading nginx
 
-[phpstatus]
-command:/usr/local/etc/rc.d/php-fpm status; exit 0
+[status]
+command:/usr/local/etc/rc.d/nginx status; exit 0
 parameters:
 type:script_output
 
@@ -66,9 +67,3 @@ type:script
 command:/usr/local/opnsense/scripts/nginx/vts.php
 parameters:
 type:script_output
-
-[reload]
-command:/usr/local/opnsense/scripts/nginx/setup.php;/usr/local/etc/rc.d/php-fpm restart;/usr/local/etc/rc.d/nginx reload
-parameters:
-type:script_output
-message:reloading nginx
diff --git a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/nginx b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/nginx
index 598e6444f..c80d61e8d 100644
--- a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/nginx
+++ b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/nginx
@@ -1,2 +1,2 @@
+nginx_setup="/usr/local/opnsense/scripts/nginx/setup.php"
 nginx_enable="YES"
-nginx_var_script="/usr/local/opnsense/scripts/nginx/setup.php"