diff --git a/src/ServicePulse.Host/app/js/services/services.service-control.js b/src/ServicePulse.Host/app/js/services/services.service-control.js
index cecfa7121f..4ed8c0f8eb 100644
--- a/src/ServicePulse.Host/app/js/services/services.service-control.js
+++ b/src/ServicePulse.Host/app/js/services/services.service-control.js
@@ -144,8 +144,9 @@
         function getMessageHeaders(messageId) {
             var url = uri.join(scu, 'messages', 'search', messageId);
             return $http.get(url).then(function(response) {
+                var matchingMessage = response.data.find(function(m) { return m.message_id === messageId; });
                 return {
-                    data: response.data
+                    headers: matchingMessage.headers
                 };
             });
         }
diff --git a/src/ServicePulse.Host/app/js/views/archive/controller.js b/src/ServicePulse.Host/app/js/views/archive/controller.js
index bfa947b244..0debba3a72 100644
--- a/src/ServicePulse.Host/app/js/views/archive/controller.js
+++ b/src/ServicePulse.Host/app/js/views/archive/controller.js
@@ -136,8 +136,8 @@
             }
 
             if (message.messageHeaders === undefined) {
-                serviceControlService.getMessageHeaders(message.message_id).then(function (msg) {
-                    message.messageHeaders = msg.data[0].headers;
+                serviceControlService.getMessageHeaders(message.message_id).then(function (response) {
+                    message.messageHeaders = response.headers;
                 }, function () {
                     message.headersUnavailable = "message headers unavailable";
                 });
diff --git a/src/ServicePulse.Host/app/js/views/message/controller.js b/src/ServicePulse.Host/app/js/views/message/controller.js
index 697a49d5b4..2bd707ed79 100644
--- a/src/ServicePulse.Host/app/js/views/message/controller.js
+++ b/src/ServicePulse.Host/app/js/views/message/controller.js
@@ -56,8 +56,8 @@
                 return false;
 
             if (!angular.isDefined(message.messageHeaders)) {
-                serviceControlService.getMessageHeaders(message.message_id).then(function (msg) {
-                    message.messageHeaders = msg.data[0].headers;
+                serviceControlService.getMessageHeaders(message.message_id).then(function (response) {
+                    message.messageHeaders = response.headers;
                 }, function () {
                     message.headersUnavailable = "message headers unavailable";
                 });
diff --git a/src/ServicePulse.Host/app/js/views/message/editor/messageEditorModal.controller.js b/src/ServicePulse.Host/app/js/views/message/editor/messageEditorModal.controller.js
index 4214cd03e2..b792e26510 100644
--- a/src/ServicePulse.Host/app/js/views/message/editor/messageEditorModal.controller.js
+++ b/src/ServicePulse.Host/app/js/views/message/editor/messageEditorModal.controller.js
@@ -69,7 +69,7 @@
             return serviceControlService.getMessageHeaders($scope.message.message_id)
                 .then(function (response) {
 
-                    $scope.message.messageHeaders = response.data[0].headers;
+                    $scope.message.messageHeaders = response.headers;
                     var intentHeader = findHeaderByKey($scope.message.messageHeaders, 'NServiceBus.MessageIntent');
                     if (intentHeader) {
                         $scope.isEvent = intentHeader.value === 'Publish';