diff --git a/lib/ServiceClient.js b/lib/ServiceClient.js
index c54189a..038b33d 100644
--- a/lib/ServiceClient.js
+++ b/lib/ServiceClient.js
@@ -98,7 +98,7 @@ class ServiceClient extends EventEmitter {
     client.connect(serviceInfo, () => {
       this._log.debug('Sending connection header');
       let serviceClientHeader = TcprosUtils.createServiceClientHeader(this._nodeHandle.getNodeName(),
-        this.getService(), this._messageHandler.Response.md5sum(), this.getType());
+        this.getService(), this._messageHandler.Request.md5sum(), this.getType());
       client.write(serviceClientHeader);
     });
 
diff --git a/lib/ServiceServer.js b/lib/ServiceServer.js
index 0db5c37..6f63e7b 100644
--- a/lib/ServiceServer.js
+++ b/lib/ServiceServer.js
@@ -77,7 +77,8 @@ class ServiceServer extends EventEmitter {
       // TODO: verify header data
       this._log.debug('Service header ' + JSON.stringify(header));
 
-      let respHeader = TcprosUtils.createServiceServerHeader(this._nodeHandle.getNodeName(), this._messageHandler.Request.md5sum(), this.getType());
+      let respHeader = TcprosUtils.createServiceServerHeader(this._nodeHandle.getNodeName(), this._messageHandler.Response.md5sum(), this.getType());
+
       client.write(respHeader);
       client.$initialized = true;
     }