diff --git a/src/main/kotlin/snc/openchargingnetwork/node/config/NodeProperties.kt b/src/main/kotlin/snc/openchargingnetwork/node/config/NodeProperties.kt
index 77f4c57..b286941 100644
--- a/src/main/kotlin/snc/openchargingnetwork/node/config/NodeProperties.kt
+++ b/src/main/kotlin/snc/openchargingnetwork/node/config/NodeProperties.kt
@@ -54,5 +54,5 @@ class NodeProperties {
 
     var plannedPartySearchEnabled: Boolean = true
 
-    var messageForwardEnabled: Boolean = true
+    var serviceEnabled: Boolean = true
 }
\ No newline at end of file
diff --git a/src/main/kotlin/snc/openchargingnetwork/node/services/AsyncTaskService.kt b/src/main/kotlin/snc/openchargingnetwork/node/services/AsyncTaskService.kt
index d6daec5..35b7b2d 100644
--- a/src/main/kotlin/snc/openchargingnetwork/node/services/AsyncTaskService.kt
+++ b/src/main/kotlin/snc/openchargingnetwork/node/services/AsyncTaskService.kt
@@ -38,11 +38,10 @@ class AsyncTaskService(private val registryService: RegistryService, private val
     fun forwardOcpiRequestToLinkedServices(requestHandler: OcpiRequestHandler<*>, fromLocalPlatform: Boolean = true) {
         // we only want to forward to services if the module is one of the default OCPI modules,
         // and only if the sender is a local platform (to avoid repeat forwarding on the recipient node)
-        // and also forward if message forward option is enabled
+        // and also forward if service interface option is enabled
         val isDefaultModule = requestHandler.request.module != ModuleID.CUSTOM
-        val isEnabledForwarding = properties.messageForwardEnabled
 
-        if (isDefaultModule && fromLocalPlatform && isEnabledForwarding) {
+        if (isDefaultModule && fromLocalPlatform && properties.serviceEnabled) {
             val request = requestHandler.request
             registryService.getAgreementsByInterface(request.headers.sender, request.module, request.interfaceRole)
                     .forEach {