diff --git a/control/json/triggers/init.cpp b/control/json/triggers/init.cpp
index 1ce272c..2a9ce9e 100644
--- a/control/json/triggers/init.cpp
+++ b/control/json/triggers/init.cpp
@@ -73,7 +73,11 @@
         auto intf = group.getInterface();
         try
         {
-            servName = mgr->getService(member, intf);
+            servName = group.getService();
+            if (servName.empty())
+            {
+                servName = mgr->getService(member, intf);
+            }
             if (!servName.empty() && lastName != servName)
             {
                 // Member not provided by same service as last group member
diff --git a/control/json/triggers/signal.cpp b/control/json/triggers/signal.cpp
index 19d7f19..7a2dce0 100644
--- a/control/json/triggers/signal.cpp
+++ b/control/json/triggers/signal.cpp
@@ -172,7 +172,11 @@
     // will do nothing since signals require a group
     for (const auto& member : group.getMembers())
     {
-        auto serv = Manager::getService(member, group.getInterface());
+        auto serv = group.getService();
+        if (serv.empty())
+        {
+            serv = Manager::getService(member, group.getInterface());
+        }
         if (!serv.empty())
         {
             // No need to re-subscribe to the same service's nameOwnerChanged