diff --git a/net/mdns-repeater/src/opnsense/mvc/app/controllers/OPNsense/MDNSRepeater/Api/ServiceController.php b/net/mdns-repeater/src/opnsense/mvc/app/controllers/OPNsense/MDNSRepeater/Api/ServiceController.php
index d5a0e9b1b..3fd038224 100644
--- a/net/mdns-repeater/src/opnsense/mvc/app/controllers/OPNsense/MDNSRepeater/Api/ServiceController.php
+++ b/net/mdns-repeater/src/opnsense/mvc/app/controllers/OPNsense/MDNSRepeater/Api/ServiceController.php
@@ -38,8 +38,20 @@ class ServiceController extends ApiControllerBase
     {
         $backend = new Backend();
         $result = array('result' => 'failed');
-        $mdlMDNSRepeater = new MDNSRepeater();
-        $result['result'] = $backend->configdRun('mdnsrepeater status');
+        $res = $backend->configdRun('mdnsrepeater status');
+        if (stripos($res, 'is running')) {
+          $result['result'] = 'running';
+        } elseif (stripos($res, 'not running')) {
+            $general = new MDNSRepeater();
+            if ((string)$general->enabled == '1') {
+                $result['result'] = 'stopped';
+            } else {
+                $result['result'] = 'disabled';
+            }
+        }
+        else {
+            $result['message'] = $res;
+        }
         return $result;
     }
 
@@ -56,7 +68,6 @@ class ServiceController extends ApiControllerBase
     {
         $backend = new Backend();
         $result = array("result" => "failed");
-        $mdlMDNSRepeater = new MDNSRepeater();
         $result['result'] = $backend->configdRun('mdnsrepeater stop');
         return $result;
     }
diff --git a/net/mdns-repeater/src/opnsense/mvc/app/views/OPNsense/MDNSRepeater/index.volt b/net/mdns-repeater/src/opnsense/mvc/app/views/OPNsense/MDNSRepeater/index.volt
index aa426acdd..789366082 100644
--- a/net/mdns-repeater/src/opnsense/mvc/app/views/OPNsense/MDNSRepeater/index.volt
+++ b/net/mdns-repeater/src/opnsense/mvc/app/views/OPNsense/MDNSRepeater/index.volt
@@ -35,7 +35,7 @@ $( document ).ready(function() {
         $('.selectpicker').selectpicker('refresh');
     });
     ajaxCall(url="/api/mdnsrepeater/service/status", sendData={}, callback=function(data,status) {
-        updateServiceStatusUI(data['status']);
+        updateServiceStatusUI(data['result']);
     });
 
     // link save button to API set action
@@ -43,7 +43,7 @@ $( document ).ready(function() {
         saveFormToEndpoint(url="/api/mdnsrepeater/settings/set", formid='general',callback_ok=function(){
             ajaxCall(url="/api/mdnsrepeater/service/restart", sendData={}, callback=function(data,status) {
                 ajaxCall(url="/api/mdnsrepeater/service/status", sendData={}, callback=function(data,status) {
-                    updateServiceStatusUI(data['status']);
+                    updateServiceStatusUI(data['result']);
                 });
             });
         });
diff --git a/net/mdns-repeater/src/opnsense/service/conf/actions.d/actions_mdnsrepeater.conf b/net/mdns-repeater/src/opnsense/service/conf/actions.d/actions_mdnsrepeater.conf
index b34033f7a..16ef2c5c5 100644
--- a/net/mdns-repeater/src/opnsense/service/conf/actions.d/actions_mdnsrepeater.conf
+++ b/net/mdns-repeater/src/opnsense/service/conf/actions.d/actions_mdnsrepeater.conf
@@ -1,24 +1,20 @@
 [start]
 command:service mdns-repeater start
-parameters:%s
 type:script
 message:starting mdns-repeater
 
 [stop]
 command:service mdns-repeater stop
-parameters:%s
 type:script
 message:stopping mdns-repeater
 
 [status]
-command:service mdns-repeater status
-parameters:%s
-type:script
+command:service mdns-repeater status; true
+type:script_output
 message:mdns-repeater status
 
 [restart]
 command:service mdns-repeater restart
-parameters:%s
 type:script
 message:restarting mdns-repeater