diff --git a/components/soap/src/main/java/org/switchyard/component/soap/OutboundHandler.java b/components/soap/src/main/java/org/switchyard/component/soap/OutboundHandler.java
index fc04eb962..fad331d67 100644
--- a/components/soap/src/main/java/org/switchyard/component/soap/OutboundHandler.java
+++ b/components/soap/src/main/java/org/switchyard/component/soap/OutboundHandler.java
@@ -260,6 +260,13 @@ public void handleMessage(final Exchange exchange) throws HandlerException {
                     if (toAddress != null) {
                         _dispatcher.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, toAddress);
                     }
+                } else {
+                    // Defaulting to use soapAction property in request header
+                    _dispatcher.getRequestContext().put(BindingProvider.SOAPACTION_USE_PROPERTY, Boolean.TRUE);
+                }
+
+                if (_config.getEndpointAddress() != null) {
+                    _dispatcher.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, _config.getEndpointAddress());
                 }
             } catch (Exception e) {
                 throw e instanceof SOAPException ? (SOAPException)e : new SOAPException(e);