diff --git a/src/Frontend/src/components/LicenseNotifications.vue b/src/Frontend/src/components/LicenseNotifications.vue
index 61c4de84fb..01e9633239 100644
--- a/src/Frontend/src/components/LicenseNotifications.vue
+++ b/src/Frontend/src/components/LicenseNotifications.vue
@@ -6,10 +6,13 @@ import { useShowToast } from "@/composables/toast";
 import { TYPE } from "vue-toastification";
 import routeLinks from "@/router/routeLinks";
 import { useRouter } from "vue-router";
+import { useConfiguration } from "@/composables/configuration";
 
 const router = useRouter();
 const { license, getOrUpdateLicenseStatus } = useLicense();
 
+const configuration = useConfiguration();
+
 function displayWarningMessage(licenseStatus: LicenseStatus) {
   const configurationRootLink = router.resolve(routeLinks.configuration.root).href;
   switch (licenseStatus) {
@@ -19,7 +22,9 @@ function displayWarningMessage(licenseStatus: LicenseStatus) {
       break;
     }
     case "ValidWithExpiringTrial": {
-      const trialExpiring = `<div><strong>Non-production development license expiring</strong><div>Your non-production development license will expire soon. To continue using the Particular Service Platform you'll need to extend your license.</div><a href="${license.license_extension_url}" class="btn btn-warning"><i class="fa fa-external-link-alt"></i> Extend your license</a><a href="${configurationRootLink}" class="btn btn-light">View license details</a></div>`;
+      const trialExpiring = configuration.value?.mass_transit_connector
+        ? `<div><strong>Early Access license expiring</strong><div>Your Early Access license will expire soon. To continue using the Particular Service Platform you'll need to extend your license.</div><a href="${license.license_extension_url}" class="btn btn-warning"><i class="fa fa-external-link-alt"></i> Extend your license</a><a href="${configurationRootLink}" class="btn btn-light">View license details</a></div>`
+        : `<div><strong>Non-production development license expiring</strong><div>Your non-production development license will expire soon. To continue using the Particular Service Platform you'll need to extend your license.</div><a href="${license.license_extension_url}" class="btn btn-warning"><i class="fa fa-external-link-alt"></i> Extend your license</a><a href="${configurationRootLink}" class="btn btn-light">View license details</a></div>`;
       useShowToast(TYPE.WARNING, "", trialExpiring, true);
       break;
     }
diff --git a/src/Frontend/src/components/PageFooter.vue b/src/Frontend/src/components/PageFooter.vue
index 839e7f343e..947033c592 100644
--- a/src/Frontend/src/components/PageFooter.vue
+++ b/src/Frontend/src/components/PageFooter.vue
@@ -5,6 +5,7 @@ import { monitoringUrl, serviceControlUrl } from "../composables/serviceServiceC
 import { license, licenseStatus } from "../composables/serviceLicense";
 import { LicenseStatus } from "@/resources/LicenseInfo";
 import routeLinks from "@/router/routeLinks";
+import { useConfiguration } from "@/composables/configuration";
 
 const isMonitoringEnabled = computed(() => {
   return monitoringUrl.value !== "!" && monitoringUrl.value !== "" && monitoringUrl.value !== null && monitoringUrl.value !== undefined;
@@ -17,6 +18,8 @@ const scAddressTooltip = computed(() => {
 const scMonitoringAddressTooltip = computed(() => {
   return `Monitoring URL ${monitoringUrl.value}`;
 });
+
+const configuration = useConfiguration();
 </script>
 
 <template>
@@ -64,7 +67,7 @@ const scMonitoringAddressTooltip = computed(() => {
           </template>
         </div>
       </div>
-      <template v-if="license.license_status !== LicenseStatus.Unavailable && licenseStatus.isTrialLicense">
+      <template v-if="license.license_status !== LicenseStatus.Unavailable && !configuration?.mass_transit_connector && licenseStatus.isTrialLicense">
         <div class="row trialLicenseBar">
           <div role="status" aria-label="trial license bar information">
             <RouterLink :to="routeLinks.configuration.license.link">{{ license.license_type }} license</RouterLink>, non-production use only
diff --git a/src/Frontend/src/components/configuration/MassTransitConnector.vue b/src/Frontend/src/components/configuration/MassTransitConnector.vue
new file mode 100644
index 0000000000..e564657d4d
--- /dev/null
+++ b/src/Frontend/src/components/configuration/MassTransitConnector.vue
@@ -0,0 +1,99 @@
+<script setup lang="ts">
+import { useConfiguration } from "@/composables/configuration";
+import moment from "moment";
+
+const configuration = useConfiguration();
+// "Wed, Jan 15th 2025 10:56:21 +10:00",
+function formatDate(date: string) {
+  return moment(date).local().format("LLLL"); //.format("ddd, MMM Do YYYY HH:mm:ss Z");
+}
+</script>
+
+<template>
+  <div class="box" v-if="configuration?.mass_transit_connector !== undefined">
+    <div class="row margin-bottom-10">
+      <h4>
+        Connector Version: <span class="version-format">{{ configuration.mass_transit_connector.version }}</span>
+      </h4>
+    </div>
+    <div class="row margin-bottom-10">
+      <h4>List of error queues configured in the connector.</h4>
+      <div class="queues-container">
+        <div class="row margin-gap hover-highlight" v-for="queue in configuration.mass_transit_connector.error_queues" :key="queue.name">
+          <div :title="queue.name">{{ queue.name }}</div>
+          <div class="error-color" v-if="!queue.ingesting">Not ingesting</div>
+          <div class="ok-color" v-else>Ok</div>
+        </div>
+      </div>
+    </div>
+    <div class="row">
+      <h4>The entries below are the most recent warning and error-level events recorded on the ServiceControl Connector.</h4>
+      <div class="logs-container">
+        <div class="row margin-gap hover-highlight" v-for="log in [...configuration.mass_transit_connector.logs].reverse()" :key="log.date">
+          <div class="col-2">{{ formatDate(log.date) }}</div>
+          <div class="col-1" :class="`${log.level.toLowerCase()}-color`">{{ log.level }}</div>
+          <div class="col-9" :class="`${log.level.toLowerCase()}-color`">
+            <pre>{{ log.message }}</pre>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="box" v-else>
+    <p>MassTransit Connector for ServiceControl is not configured.</p>
+    <p><a target="_blank" href="https://particular.net/learn-more-about-masstransit-connector">Learn more about the MassTransit Connector.</a></p>
+  </div>
+</template>
+
+<style scoped>
+.hover-highlight:hover {
+  background-color: #ededed;
+}
+
+.margin-gap {
+  margin-bottom: 3px;
+}
+
+.queues-container {
+  max-width: 100%;
+  width: fit-content;
+  padding: 0.75rem;
+}
+.queues-container .row {
+  display: grid;
+  grid-template-columns: 5fr minmax(10em, 1fr);
+}
+.queues-container .row div {
+  overflow-wrap: anywhere;
+}
+
+.logs-container {
+  padding: 0.75rem;
+}
+.version-format {
+  font-weight: bold;
+}
+.box > .row:not(:last-child) {
+  padding-bottom: 0.5rem;
+  border-bottom: 1px solid #ccc;
+  margin-bottom: 0.5rem;
+}
+
+.logs-container pre {
+  all: revert;
+  margin: 0;
+  font-size: 0.9rem;
+  overflow-wrap: break-word;
+  text-wrap: auto;
+}
+
+.warning-color {
+  color: var(--bs-warning);
+}
+.error-color {
+  color: var(--bs-danger);
+}
+.ok-color {
+  color: var(--bs-success);
+}
+</style>
diff --git a/src/Frontend/src/components/configuration/PlatformLicense.vue b/src/Frontend/src/components/configuration/PlatformLicense.vue
index e24f96517e..be11c77f26 100644
--- a/src/Frontend/src/components/configuration/PlatformLicense.vue
+++ b/src/Frontend/src/components/configuration/PlatformLicense.vue
@@ -6,6 +6,8 @@ import { connectionState } from "@/composables/serviceServiceControl";
 import BusyIndicator from "../BusyIndicator.vue";
 import ExclamationMark from "./../../components/ExclamationMark.vue";
 import convertToWarningLevel from "@/components/configuration/convertToWarningLevel";
+import { useConfiguration } from "@/composables/configuration";
+import { typeText } from "@/resources/LicenseInfo";
 
 // This is needed because the ConfigurationView.vue routerView expects this event.
 // The event is only actually emitted on the RetryRedirects.vue component
@@ -18,6 +20,8 @@ defineEmits<{
 const loading = computed(() => {
   return !license;
 });
+
+const configuration = useConfiguration();
 </script>
 
 <template>
@@ -31,7 +35,7 @@ const loading = computed(() => {
           <div class="box">
             <div class="row">
               <div class="license-info">
-                <div><b>Platform license type:</b> {{ license.license_type }}{{ license.licenseEdition }}</div>
+                <div><b>Platform license type:</b> {{ typeText(license, configuration) }}{{ license.licenseEdition }}</div>
 
                 <template v-if="licenseStatus.isSubscriptionLicense">
                   <div>
diff --git a/src/Frontend/src/components/failedmessages/DeletedMessages.vue b/src/Frontend/src/components/failedmessages/DeletedMessages.vue
index 3721816dc8..678e15c455 100644
--- a/src/Frontend/src/components/failedmessages/DeletedMessages.vue
+++ b/src/Frontend/src/components/failedmessages/DeletedMessages.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onBeforeMount, onMounted, onUnmounted, ref, watch } from "vue";
+import { onMounted, onUnmounted, ref, watch } from "vue";
 import { licenseStatus } from "../../composables/serviceLicense";
 import { connectionState } from "../../composables/serviceServiceControl";
 import { usePatchToServiceControl, useTypedFetchFromServiceControl } from "../../composables/serviceServiceControlUrls";
@@ -13,14 +13,13 @@ import ConfirmDialog from "../ConfirmDialog.vue";
 import PaginationStrip from "../../components/PaginationStrip.vue";
 import moment from "moment";
 import { ExtendedFailedMessage } from "@/resources/FailedMessage";
-import Configuration from "@/resources/Configuration";
 import { TYPE } from "vue-toastification";
 import FailureGroup from "@/resources/FailureGroup";
+import { useConfiguration } from "@/composables/configuration";
 
 let pollingFaster = false;
 let refreshInterval: number | undefined;
 const perPage = 50;
-const configuration = ref<Configuration | null>(null);
 
 const route = useRoute();
 const groupId = ref<string>(route.params.groupId as string);
@@ -36,6 +35,7 @@ const messageList = ref<IMessageList | undefined>();
 const messages = ref<ExtendedFailedMessage[]>([]);
 
 watch(pageNumber, () => loadMessages());
+const configuration = useConfiguration();
 
 function loadMessages() {
   let startDate = new Date(0);
@@ -162,11 +162,6 @@ function periodChanged(period: PeriodOption) {
   loadMessages();
 }
 
-async function getConfiguration() {
-  const [, data] = await useTypedFetchFromServiceControl<Configuration>("configuration");
-  configuration.value = data;
-}
-
 function isRestoreInProgress() {
   return messages.value.some((message) => message.restoreInProgress);
 }
@@ -196,10 +191,6 @@ onBeforeRouteLeave(() => {
   groupName.value = "";
 });
 
-onBeforeMount(() => {
-  getConfiguration();
-});
-
 onUnmounted(() => {
   if (refreshInterval != null) {
     window.clearInterval(refreshInterval);
diff --git a/src/Frontend/src/components/failedmessages/EditMessageHeader.vue b/src/Frontend/src/components/failedmessages/EditMessageHeader.vue
index 16be1388ae..8782ea4ef6 100644
--- a/src/Frontend/src/components/failedmessages/EditMessageHeader.vue
+++ b/src/Frontend/src/components/failedmessages/EditMessageHeader.vue
@@ -3,7 +3,7 @@ import { computed, onMounted, ref, watch } from "vue";
 
 interface MessageHeader {
   key: string;
-  value: string;
+  value?: string;
   isChanged: boolean;
   isMarkedAsRemoved: boolean;
   isLocked: boolean;
@@ -14,7 +14,7 @@ const settings = defineProps<{
   header: MessageHeader;
 }>();
 
-let origHeaderValue: string;
+let origHeaderValue: string | undefined;
 const header = ref<MessageHeader>(settings.header);
 
 const headerValue = computed(() => settings.header.value);
diff --git a/src/Frontend/src/components/failedmessages/EditRetryDialog.vue b/src/Frontend/src/components/failedmessages/EditRetryDialog.vue
index c29be62943..8f6a321939 100644
--- a/src/Frontend/src/components/failedmessages/EditRetryDialog.vue
+++ b/src/Frontend/src/components/failedmessages/EditRetryDialog.vue
@@ -24,8 +24,30 @@ const props = defineProps<{
   configuration: EditAndRetryConfig;
 }>();
 
-const panel = ref();
-const localMessage = ref();
+interface LocalMessageState {
+  isBodyChanged: boolean;
+  isBodyEmpty: boolean;
+  isContentTypeSupported: boolean;
+  bodyContentType: string | undefined;
+  bodyUnavailable: boolean;
+  isEvent: boolean;
+  retried: boolean;
+  headers: HeaderWithEditing[];
+  messageBody: string;
+}
+
+const panel = ref(0);
+const localMessage = ref<LocalMessageState>({
+  isBodyChanged: false,
+  isBodyEmpty: false,
+  isContentTypeSupported: false,
+  bodyContentType: undefined,
+  bodyUnavailable: true,
+  isEvent: false,
+  retried: false,
+  headers: [],
+  messageBody: "",
+});
 let origMessageBody: string;
 
 const showEditAndRetryConfirmation = ref(false);
@@ -79,10 +101,12 @@ function findHeadersByKey(key: string) {
 
 function getContentType() {
   const header = findHeadersByKey("NServiceBus.ContentType");
-  return header.value;
+  return header?.value;
 }
 
-function isContentTypeSupported(contentType: string) {
+function isContentTypeSupported(contentType: string | undefined) {
+  if (contentType === undefined) return false;
+
   if (contentType.startsWith("text/")) return true;
 
   const charsetUtf8 = "; charset=utf-8";
@@ -106,7 +130,7 @@ function isContentTypeSupported(contentType: string) {
 
 function getMessageIntent() {
   const intent = findHeadersByKey("NServiceBus.MessageIntent");
-  return intent.value;
+  return intent?.value;
 }
 
 function removeHeadersMarkedAsRemoved() {
@@ -127,7 +151,17 @@ async function retryEditedMessage() {
 
 function initializeMessageBodyAndHeaders() {
   origMessageBody = props.message.messageBody;
-  localMessage.value = props.message;
+  localMessage.value = {
+    isBodyChanged: false,
+    isBodyEmpty: false,
+    isContentTypeSupported: false,
+    bodyContentType: undefined,
+    bodyUnavailable: props.message.bodyUnavailable,
+    isEvent: false,
+    retried: props.message.retried,
+    headers: props.message.headers.map((header: Header) => ({ ...header })) as HeaderWithEditing[],
+    messageBody: props.message.messageBody,
+  };
   localMessage.value.isBodyEmpty = false;
   localMessage.value.isBodyChanged = false;
 
@@ -136,7 +170,7 @@ function initializeMessageBodyAndHeaders() {
   localMessage.value.isContentTypeSupported = isContentTypeSupported(contentType);
 
   const messageIntent = getMessageIntent();
-  localMessage.value.isEvent = messageIntent.value === "Publish";
+  localMessage.value.isEvent = messageIntent === "Publish";
 
   for (let index = 0; index < props.message.headers.length; index++) {
     const header: HeaderWithEditing = props.message.headers[index] as HeaderWithEditing;
@@ -191,15 +225,15 @@ onMounted(() => {
                   </div>
                   <div class="row msg-editor-content">
                     <div class="col-sm-12 no-side-padding">
-                      <div class="alert alert-warning" v-if="localMessage?.isEvent">
+                      <div class="alert alert-warning" v-if="localMessage.isEvent">
                         <div class="col-sm-12">
                           <i class="fa fa-exclamation-circle"></i> This message is an event. If it was already successfully handled by other subscribers, editing it now has the risk of changing the semantic meaning of the event and may result in
                           altering the system behavior.
                         </div>
                       </div>
-                      <div class="alert alert-warning" v-if="!localMessage?.isContentTypeSupported || localMessage?.bodyUnavailable">
+                      <div class="alert alert-warning" v-if="!localMessage.isContentTypeSupported || localMessage.bodyUnavailable">
                         <div role="status" aria-label="cannot edit message body" class="col-sm-12">
-                          <i class="fa fa-exclamation-circle"></i> Message body cannot be edited because content type "{{ localMessage?.bodyContentType }}" is not supported. Only messages with content types "application/json" and "text/xml" can be
+                          <i class="fa fa-exclamation-circle"></i> Message body cannot be edited because content type "{{ localMessage.bodyContentType }}" is not supported. Only messages with content types "application/json" and "text/xml" can be
                           edited.
                         </div>
                       </div>
@@ -208,16 +242,16 @@ onMounted(() => {
                       </div>
                       <table role="tabpanel" class="table" v-if="panel === 1">
                         <tbody>
-                          <tr class="interactiveList" v-for="header in localMessage?.headers" :key="header.key">
+                          <tr class="interactiveList" v-for="header in localMessage.headers" :key="header.key">
                             <MessageHeader :header="header"></MessageHeader>
                           </tr>
                         </tbody>
                       </table>
-                      <div role="tabpanel" v-if="panel === 2 && !localMessage?.bodyUnavailable" style="height: calc(100% - 260px)">
-                        <textarea aria-label="message body" class="form-control" :disabled="!localMessage?.isContentTypeSupported" v-model="localMessage.messageBody"></textarea>
-                        <span class="empty-error" v-if="localMessage?.isBodyEmpty"><i class="fa fa-exclamation-triangle"></i> Message body cannot be empty</span>
-                        <span class="reset-body" v-if="localMessage?.isBodyChanged"><i class="fa fa-undo" v-tippy="`Reset changes`"></i> <a @click="resetBodyChanges()" href="javascript:void(0)">Reset changes</a></span>
-                        <div class="alert alert-info" v-if="localMessage?.panel === 2 && localMessage.bodyUnavailable">{{ localMessage.bodyUnavailable }}</div>
+                      <div role="tabpanel" v-if="panel === 2 && !localMessage.bodyUnavailable" style="height: calc(100% - 260px)">
+                        <textarea aria-label="message body" class="form-control" :disabled="!localMessage.isContentTypeSupported" v-model="localMessage.messageBody"></textarea>
+                        <span class="empty-error" v-if="localMessage.isBodyEmpty"><i class="fa fa-exclamation-triangle"></i> Message body cannot be empty</span>
+                        <span class="reset-body" v-if="localMessage.isBodyChanged"><i class="fa fa-undo" v-tippy="`Reset changes`"></i> <a @click="resetBodyChanges()" href="javascript:void(0)">Reset changes</a></span>
+                        <div class="alert alert-info" v-if="panel === 2 && localMessage.bodyUnavailable">{{ localMessage.bodyUnavailable }}</div>
                       </div>
                     </div>
                   </div>
@@ -226,7 +260,7 @@ onMounted(() => {
             </div>
             <div class="modal-footer" v-if="!showEditAndRetryConfirmation && !showCancelConfirmation">
               <button class="btn btn-default" @click="confirmCancel()">Cancel</button>
-              <button class="btn btn-primary" :disabled="localMessage?.isBodyEmpty || localMessage?.bodyUnavailable" @click="confirmEditAndRetry()">Retry</button>
+              <button class="btn btn-primary" :disabled="localMessage.isBodyEmpty || localMessage.bodyUnavailable" @click="confirmEditAndRetry()">Retry</button>
             </div>
             <div class="modal-footer cancel-confirmation" v-if="showCancelConfirmation">
               <div>Are you sure you want to cancel? Any changes you made will be lost.</div>
diff --git a/src/Frontend/src/components/failedmessages/MessageView.vue b/src/Frontend/src/components/failedmessages/MessageView.vue
index 5ffc771e67..535b281e25 100644
--- a/src/Frontend/src/components/failedmessages/MessageView.vue
+++ b/src/Frontend/src/components/failedmessages/MessageView.vue
@@ -12,11 +12,13 @@ import ConfirmDialog from "../ConfirmDialog.vue";
 import FlowDiagram from "./FlowDiagram.vue";
 import EditRetryDialog from "./EditRetryDialog.vue";
 import routeLinks from "@/router/routeLinks";
-import Configuration, { EditAndRetryConfig } from "@/resources/Configuration";
+import { EditAndRetryConfig } from "@/resources/Configuration";
 import { TYPE } from "vue-toastification";
 import { ExtendedFailedMessage, FailedMessageError, FailedMessageStatus, isError } from "@/resources/FailedMessage";
 import Message from "@/resources/Message";
 import { NServiceBusHeaders } from "@/resources/Header";
+import { useConfiguration } from "@/composables/configuration";
+import { useIsMassTransitConnected } from "@/composables/useIsMassTransitConnected";
 import { parse, stringify } from "lossless-json";
 
 let refreshInterval: number | undefined;
@@ -24,7 +26,6 @@ let pollingFaster = false;
 const panel = ref<number>(1);
 const route = useRoute();
 const failedMessage = ref<ExtendedFailedMessage | FailedMessageError>();
-const configuration = ref<Configuration>();
 const editAndRetryConfiguration = ref<EditAndRetryConfig>();
 
 const id = computed(() => route.params.id as string);
@@ -35,6 +36,9 @@ const showRestoreConfirm = ref(false);
 const showRetryConfirm = ref(false);
 const showEditRetryModal = ref(false);
 
+const configuration = useConfiguration();
+const isMassTransitConnected = useIsMassTransitConnected();
+
 async function loadFailedMessage() {
   try {
     const response = await useFetchFromServiceControl("errors/last/" + id.value);
@@ -71,12 +75,6 @@ async function loadFailedMessage() {
   }
 }
 
-async function getConfiguration() {
-  const response = await useFetchFromServiceControl("configuration");
-  configuration.value = await response.json();
-  return getEditAndRetryConfig();
-}
-
 async function getEditAndRetryConfig() {
   const [, data] = await useTypedFetchFromServiceControl<EditAndRetryConfig>("edit/config");
 
@@ -365,7 +363,7 @@ function changeRefreshInterval(milliseconds: number) {
 onMounted(async () => {
   togglePanel(1);
 
-  await getConfiguration();
+  await getEditAndRetryConfig();
   startRefreshInterval();
   loadFailedMessage();
 });
@@ -407,8 +405,8 @@ onUnmounted(() => {
                 <span v-if="failedMessage.edited" v-tippy="`Message was edited`" class="label sidebar-label label-info metadata-label">Edited</span>
                 <span v-if="failedMessage.edited" class="metadata metadata-link"><i class="fa fa-history"></i> <RouterLink :to="routeLinks.failedMessage.message.link(failedMessage.edit_of)">View previous version</RouterLink></span>
                 <span v-if="failedMessage.time_of_failure" class="metadata"><i class="fa fa-clock-o"></i> Failed: <time-since :date-utc="failedMessage.time_of_failure"></time-since></span>
-                <span class="metadata"><i class="fa pa-endpoint"></i> Endpoint: {{ failedMessage.receiving_endpoint?.name }}</span>
-                <span class="metadata"><i class="fa fa-laptop"></i> Machine: {{ failedMessage.receiving_endpoint?.host }}</span>
+                <span class="metadata"><i class="fa pa-endpoint"></i> Endpoint: {{ failedMessage.receiving_endpoint.name }}</span>
+                <span class="metadata"><i class="fa fa-laptop"></i> Machine: {{ failedMessage.receiving_endpoint.host }}</span>
                 <span v-if="failedMessage.redirect" class="metadata"><i class="fa pa-redirect-source pa-redirect-small"></i> Redirect: {{ failedMessage.redirect }}</span>
               </div>
               <div class="metadata group-message-count message-metadata" v-if="failedMessage.archived">
@@ -427,7 +425,9 @@ onUnmounted(() => {
                 <button type="button" class="btn btn-default" v-if="failedMessage.isEditAndRetryEnabled" :disabled="failedMessage.retried || failedMessage.archived || failedMessage.resolved" @click="showEditAndRetryModal()">
                   <i class="fa fa-pencil"></i> Edit & retry
                 </button>
-                <button type="button" class="btn btn-default" @click="debugInServiceInsight()" title="Browse this message in ServiceInsight, if installed"><img src="@/assets/si-icon.svg" /> View in ServiceInsight</button>
+                <button v-if="!isMassTransitConnected" type="button" class="btn btn-default" @click="debugInServiceInsight()" title="Browse this message in ServiceInsight, if installed">
+                  <img src="@/assets/si-icon.svg" /> View in ServiceInsight
+                </button>
                 <button type="button" class="btn btn-default" @click="exportMessage()"><i class="fa fa-download"></i> Export message</button>
               </div>
             </div>
@@ -438,7 +438,7 @@ onUnmounted(() => {
                 <h5 :class="{ active: panel === 1 }" class="nav-item" @click="togglePanel(1)"><a href="javascript:void(0)">Stacktrace</a></h5>
                 <h5 :class="{ active: panel === 2 }" class="nav-item" @click="togglePanel(2)"><a href="javascript:void(0)">Headers</a></h5>
                 <h5 :class="{ active: panel === 3 }" class="nav-item" @click="togglePanel(3)"><a href="javascript:void(0)">Message body</a></h5>
-                <h5 :class="{ active: panel === 4 }" class="nav-item" @click="togglePanel(4)"><a href="javascript:void(0)">Flow Diagram</a></h5>
+                <h5 v-if="!isMassTransitConnected" :class="{ active: panel === 4 }" class="nav-item" @click="togglePanel(4)"><a href="javascript:void(0)">Flow Diagram</a></h5>
               </div>
               <pre v-if="panel === 0">{{ failedMessage.exception?.message }}</pre>
               <pre v-if="panel === 1">{{ failedMessage.exception?.stack_trace }}</pre>
@@ -552,4 +552,14 @@ button img {
   height: 14px;
   width: 14px;
 }
+
+.pa-endpoint {
+  position: relative;
+  top: 3px;
+  background-image: url("@/assets/endpoint.svg");
+  background-position: center;
+  background-repeat: no-repeat;
+  height: 15px;
+  width: 15px;
+}
 </style>
diff --git a/src/Frontend/src/components/failedmessages/PendingRetries.vue b/src/Frontend/src/components/failedmessages/PendingRetries.vue
index 6492514b67..5a2b42a4f6 100644
--- a/src/Frontend/src/components/failedmessages/PendingRetries.vue
+++ b/src/Frontend/src/components/failedmessages/PendingRetries.vue
@@ -16,6 +16,7 @@ import SortOptions, { SortDirection } from "@/resources/SortOptions";
 import QueueAddress from "@/resources/QueueAddress";
 import { TYPE } from "vue-toastification";
 import GroupOperation from "@/resources/GroupOperation";
+import { useIsMassTransitConnected } from "@/composables/useIsMassTransitConnected";
 
 let refreshInterval: number | undefined;
 let sortMethod: SortOptions<GroupOperation> | undefined;
@@ -49,6 +50,7 @@ const sortOptions: SortOptions<GroupOperation>[] = [
   },
 ];
 const periodOptions = ["All Pending Retries", "Retried in the last 2 Hours", "Retried in the last 1 Day", "Retried in the last 7 Days"];
+const isMassTransitConnected = useIsMassTransitConnected();
 
 watch(pageNumber, () => loadPendingRetryMessages());
 
@@ -246,6 +248,9 @@ onMounted(() => {
               <i class="fa fa-external-link fake-link"></i>
             </div>
           </div>
+          <div class="col-12" v-if="isMassTransitConnected">
+            <div class="alert alert-info">MassTransit endpoints currently do not report when a pending retry has succeeded, and therefore any messages associated with those endpoints will need to be manually marked as resolved.</div>
+          </div>
         </div>
         <div class="row">
           <div class="col-6">
diff --git a/src/Frontend/src/components/monitoring/MonitoringHead.vue b/src/Frontend/src/components/monitoring/MonitoringHead.vue
index 2ef7caf4b5..a10d75c898 100644
--- a/src/Frontend/src/components/monitoring/MonitoringHead.vue
+++ b/src/Frontend/src/components/monitoring/MonitoringHead.vue
@@ -1,5 +1,8 @@
 <script setup lang="ts">
+import { useIsMassTransitConnected } from "@/composables/useIsMassTransitConnected";
 import MonitoringFilter from "./MonitoringFilter.vue";
+
+const isMassTransitConnected = useIsMassTransitConnected();
 </script>
 
 <template>
@@ -10,6 +13,9 @@ import MonitoringFilter from "./MonitoringFilter.vue";
     <div class="col-sm-8 no-side-padding toolbar-menus">
       <MonitoringFilter />
     </div>
+    <div class="col-12" v-if="isMassTransitConnected">
+      <div class="alert alert-info">MassTransit endpoints are currently not supported by monitoring functionality and will not show in this view.</div>
+    </div>
   </div>
 </template>
 
diff --git a/src/Frontend/src/composables/configuration.ts b/src/Frontend/src/composables/configuration.ts
new file mode 100644
index 0000000000..ea06003fa7
--- /dev/null
+++ b/src/Frontend/src/composables/configuration.ts
@@ -0,0 +1,15 @@
+import Configuration from "@/resources/Configuration";
+import { ref } from "vue";
+import { useFetchFromServiceControl } from "./serviceServiceControlUrls";
+
+export function useConfiguration() {
+  const configuration = ref<Configuration | null>(null);
+
+  async function populate() {
+    const response = await useFetchFromServiceControl("configuration");
+    configuration.value = await response.json();
+  }
+  populate();
+
+  return configuration;
+}
diff --git a/src/Frontend/src/composables/serviceMonitoringEndpoints.ts b/src/Frontend/src/composables/serviceMonitoringEndpoints.ts
index 2e667a67df..27d77fa549 100644
--- a/src/Frontend/src/composables/serviceMonitoringEndpoints.ts
+++ b/src/Frontend/src/composables/serviceMonitoringEndpoints.ts
@@ -3,7 +3,6 @@ import { useTypedFetchFromMonitoring, useIsMonitoringDisabled } from "./serviceS
 import { monitoringConnectionState } from "./serviceServiceControl";
 import { useGetExceptionGroups } from "./serviceMessageGroup";
 import { type Endpoint, type GroupedEndpoint, type EndpointGroup, type EndpointDetails, type EndpointDetailsError } from "@/resources/MonitoringEndpoint";
-import { emptyEndpointMetrics } from "@/components/monitoring/endpoints";
 
 /**
  * @returns the max number of segments in a array of endpoint object names
@@ -110,31 +109,15 @@ async function addEndpointsFromScSubscription(endpoints: Endpoint[]) {
   if (exceptionGroups.length > 0) {
     //sort the exceptionGroups array by name - case sensitive
     exceptionGroups.sort((a, b) => (a.title > b.title ? 1 : a.title < b.title ? -1 : 0)); //desc
-    exceptionGroups.forEach((failedMessageEndpoint) => {
-      if (failedMessageEndpoint.operation_status === "ArchiveCompleted") {
-        return;
-      }
-      const index = endpoints.findIndex(function (item) {
-        return item.name === failedMessageEndpoint.title;
+    exceptionGroups
+      .filter((exceptionGroup) => exceptionGroup.operation_status !== "ArchiveCompleted")
+      .forEach((exceptionGroup) => {
+        const monitoredEndpoint = endpoints.find((item) => item.name === exceptionGroup.title);
+        if (monitoredEndpoint) {
+          monitoredEndpoint.serviceControlId = exceptionGroup.id;
+          monitoredEndpoint.errorCount = exceptionGroup.count;
+        }
       });
-      if (index >= 0) {
-        endpoints[index].serviceControlId = failedMessageEndpoint.id;
-        endpoints[index].errorCount = failedMessageEndpoint.count;
-      } else {
-        const metricsToAdd = emptyEndpointMetrics();
-        endpoints.push({
-          name: failedMessageEndpoint.title,
-          isStale: false,
-          endpointInstanceIds: [],
-          disconnectedCount: 0,
-          connectedCount: 0,
-          errorCount: failedMessageEndpoint.count,
-          serviceControlId: failedMessageEndpoint.id,
-          isScMonitoringDisconnected: true,
-          metrics: metricsToAdd,
-        });
-      }
-    });
   }
 }
 
diff --git a/src/Frontend/src/composables/useIsMassTransitConnected.ts b/src/Frontend/src/composables/useIsMassTransitConnected.ts
new file mode 100644
index 0000000000..5b1967ddb8
--- /dev/null
+++ b/src/Frontend/src/composables/useIsMassTransitConnected.ts
@@ -0,0 +1,7 @@
+import { computed } from "vue";
+import { useConfiguration } from "./configuration";
+
+export function useIsMassTransitConnected() {
+  const configuration = useConfiguration();
+  return computed(() => configuration.value?.mass_transit_connector !== undefined);
+}
diff --git a/src/Frontend/src/resources/Configuration.ts b/src/Frontend/src/resources/Configuration.ts
index e1a303d218..53b2bacf73 100644
--- a/src/Frontend/src/resources/Configuration.ts
+++ b/src/Frontend/src/resources/Configuration.ts
@@ -1,9 +1,15 @@
 export default interface Configuration {
   host: Host;
-  data_retention: Dataretention;
-  performance_tunning: Performancetunning;
+  data_retention: DataRetention;
+  performance_tunning: PerformanceTuning;
   transport: Transport;
   plugins: Plugins;
+  mass_transit_connector?: MassTransitConnector;
+}
+interface MassTransitConnector {
+  version: string;
+  logs: Array<{ level: string; message: string; date: string }>;
+  error_queues: Array<{ name: string; ingesting: boolean }>;
 }
 interface Plugins {
   heartbeat_grace_period: string;
@@ -14,13 +20,13 @@ interface Transport {
   error_queue: string;
   forward_error_messages: boolean;
 }
-interface Performancetunning {
+interface PerformanceTuning {
   http_default_connection_limit: number;
   external_integrations_dispatching_batch_size: number;
   expiration_process_batch_size: number;
   expiration_process_timer_in_seconds: number;
 }
-interface Dataretention {
+interface DataRetention {
   error_retention_period: string;
 }
 interface Host {
diff --git a/src/Frontend/src/resources/LicenseInfo.ts b/src/Frontend/src/resources/LicenseInfo.ts
index 9644cf5b84..5cafcfcded 100644
--- a/src/Frontend/src/resources/LicenseInfo.ts
+++ b/src/Frontend/src/resources/LicenseInfo.ts
@@ -1,3 +1,5 @@
+import Configuration from "./Configuration";
+
 export default interface LicenseInfo {
   registered_to: string;
   edition: string;
@@ -11,6 +13,12 @@ export default interface LicenseInfo {
   status: string;
 }
 
+export function typeText(license: LicenseInfo, configuration: Configuration | null) {
+  if (license.trial_license && configuration?.mass_transit_connector) {
+    return "Early Access";
+  }
+}
+
 export enum LicenseStatus {
   Valid = "Valid",
   Unavailable = "Unavailable",
diff --git a/src/Frontend/src/router/config.ts b/src/Frontend/src/router/config.ts
index 17e6a15e09..0f719f134f 100644
--- a/src/Frontend/src/router/config.ts
+++ b/src/Frontend/src/router/config.ts
@@ -157,6 +157,11 @@ const config: RouteItem[] = [
         path: routeLinks.configuration.license.template,
         component: () => import("@/components/configuration/PlatformLicense.vue"),
       },
+      {
+        title: "MassTransit Connector",
+        path: routeLinks.configuration.massTransitConnector.template,
+        component: () => import("@/components/configuration/MassTransitConnector.vue"),
+      },
       {
         title: "Health Check Notifications",
         path: routeLinks.configuration.healthCheckNotifications.template,
diff --git a/src/Frontend/src/router/routeLinks.ts b/src/Frontend/src/router/routeLinks.ts
index 2777712ca3..284da580b5 100644
--- a/src/Frontend/src/router/routeLinks.ts
+++ b/src/Frontend/src/router/routeLinks.ts
@@ -8,7 +8,7 @@ const heartbeatLinks = (root: string) => {
     unhealthy: createLink("unhealthy"),
     healthy: createLink("healthy"),
     configuration: createLink("configuration"),
-    instances: { link: (endpointName: string) => `${root}/instances/${endpointName}`, template: "/heartbeats/instances/:endpointName" },
+    instances: { link: (endpointName: string) => `${root}/instances/${encodeURIComponent(endpointName)}`, template: "/heartbeats/instances/:endpointName" },
   };
 };
 
@@ -38,6 +38,7 @@ const configurationLinks = (root: string) => {
   return {
     root,
     license: createLink("license"),
+    massTransitConnector: createLink("mass-transit-connector"),
     healthCheckNotifications: createLink("health-check-notifications"),
     retryRedirects: createLink("retry-redirects"),
     connections: createLink("connections"),
@@ -81,7 +82,10 @@ const throughputEndpointLinks = (root: string) => {
 const monitoringLinks = (root: string) => {
   return {
     root,
-    endpointDetails: { link: (endpointName: string, historyPeriod: number, tab?: string) => `${root}/endpoint/${endpointName}?historyPeriod=${historyPeriod}${(tab && `&tab=${tab}`) ?? ""}`, template: "/monitoring/endpoint/:endpointName" },
+    endpointDetails: {
+      link: (endpointName: string, historyPeriod: number, tab?: string) => `${root}/endpoint/${encodeURIComponent(endpointName)}?historyPeriod=${historyPeriod}${(tab && `&tab=${tab}`) ?? ""}`,
+      template: "/monitoring/endpoint/:endpointName",
+    },
   };
 };
 
diff --git a/src/Frontend/src/stores/HeartbeatInstancesStore.spec.ts b/src/Frontend/src/stores/HeartbeatInstancesStore.spec.ts
index 64dc9214c2..9cb94fb531 100644
--- a/src/Frontend/src/stores/HeartbeatInstancesStore.spec.ts
+++ b/src/Frontend/src/stores/HeartbeatInstancesStore.spec.ts
@@ -39,7 +39,14 @@ describe("HeartbeatInstancesStore tests", () => {
   });
 
   test("filter by name", async () => {
-    const defaultEndpointsView = <EndpointsView>{ is_sending_heartbeats: false, id: "", name: "", monitor_heartbeat: false, host_display_name: "", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" } };
+    const defaultEndpointsView = <EndpointsView>{
+      is_sending_heartbeats: false,
+      id: "",
+      name: "",
+      monitor_heartbeat: false,
+      host_display_name: "",
+      heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" },
+    };
     const { filteredInstances, instanceFilterString } = await setup(
       [
         { ...defaultEndpointsView, ...(<Partial<EndpointsView>>{ host_display_name: "John" }) },
@@ -57,7 +64,14 @@ describe("HeartbeatInstancesStore tests", () => {
   });
 
   test("sort by", async () => {
-    const defaultEndpointsView = <EndpointsView>{ is_sending_heartbeats: false, id: "", name: "", monitor_heartbeat: false, host_display_name: "", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" } };
+    const defaultEndpointsView = <EndpointsView>{
+      is_sending_heartbeats: false,
+      id: "",
+      name: "",
+      monitor_heartbeat: false,
+      host_display_name: "",
+      heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" },
+    };
     const { filteredInstances, sortByInstances } = await setup(
       [
         { ...defaultEndpointsView, ...(<Partial<EndpointsView>>{ host_display_name: "John", heartbeat_information: { last_report_at: "2024-10-01T00:00:00" } }) },
diff --git a/src/Frontend/src/stores/HeartbeatsStore.spec.ts b/src/Frontend/src/stores/HeartbeatsStore.spec.ts
index 2177391cfb..e78b32606f 100644
--- a/src/Frontend/src/stores/HeartbeatsStore.spec.ts
+++ b/src/Frontend/src/stores/HeartbeatsStore.spec.ts
@@ -42,7 +42,14 @@ describe("HeartbeatsStore tests", () => {
 
   describe("healthchecks total", () => {
     test("all heart beating", async () => {
-      const defaultEndpointsView = <EndpointsView>{ is_sending_heartbeats: true, id: "", name: "", monitor_heartbeat: true, host_display_name: "", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" } };
+      const defaultEndpointsView = <EndpointsView>{
+        is_sending_heartbeats: true,
+        id: "",
+        name: "",
+        monitor_heartbeat: true,
+        host_display_name: "",
+        heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" },
+      };
       const { failedHeartbeatsCount } = await setup(
         [
           { ...defaultEndpointsView, ...(<Partial<EndpointsView>>{ name: "John" }) },
@@ -57,7 +64,14 @@ describe("HeartbeatsStore tests", () => {
     });
 
     test("some not heart beating", async () => {
-      const defaultEndpointsView = <EndpointsView>{ is_sending_heartbeats: true, id: "", name: "", monitor_heartbeat: true, host_display_name: "", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" } };
+      const defaultEndpointsView = <EndpointsView>{
+        is_sending_heartbeats: true,
+        id: "",
+        name: "",
+        monitor_heartbeat: true,
+        host_display_name: "",
+        heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" },
+      };
       const { failedHeartbeatsCount } = await setup(
         [
           { ...defaultEndpointsView, ...(<Partial<EndpointsView>>{ name: "John" }) },
@@ -72,7 +86,14 @@ describe("HeartbeatsStore tests", () => {
     });
 
     test("some not heart beating with no tracking", async () => {
-      const defaultEndpointsView = <EndpointsView>{ is_sending_heartbeats: true, id: "", name: "", monitor_heartbeat: true, host_display_name: "", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" } };
+      const defaultEndpointsView = <EndpointsView>{
+        is_sending_heartbeats: true,
+        id: "",
+        name: "",
+        monitor_heartbeat: true,
+        host_display_name: "",
+        heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" },
+      };
       const { failedHeartbeatsCount } = await setup(
         [
           { ...defaultEndpointsView, ...(<Partial<EndpointsView>>{ name: "John" }) },
@@ -90,7 +111,14 @@ describe("HeartbeatsStore tests", () => {
     });
 
     test("some not heart beating in same logical endpoint and tracking", async () => {
-      const defaultEndpointsView = <EndpointsView>{ is_sending_heartbeats: true, id: "", name: "", monitor_heartbeat: true, host_display_name: "", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" } };
+      const defaultEndpointsView = <EndpointsView>{
+        is_sending_heartbeats: true,
+        id: "",
+        name: "",
+        monitor_heartbeat: true,
+        host_display_name: "",
+        heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" },
+      };
       const { failedHeartbeatsCount } = await setup(
         [
           { ...defaultEndpointsView, ...(<Partial<EndpointsView>>{ name: "John" }) },
@@ -106,7 +134,14 @@ describe("HeartbeatsStore tests", () => {
     });
 
     test("all instances muted", async () => {
-      const defaultEndpointsView = <EndpointsView>{ is_sending_heartbeats: true, id: "", name: "", monitor_heartbeat: true, host_display_name: "", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" } };
+      const defaultEndpointsView = <EndpointsView>{
+        is_sending_heartbeats: true,
+        id: "",
+        name: "",
+        monitor_heartbeat: true,
+        host_display_name: "",
+        heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" },
+      };
       const { failedHeartbeatsCount } = await setup(
         [
           { ...defaultEndpointsView, ...(<Partial<EndpointsView>>{ name: "John" }) },
@@ -127,7 +162,14 @@ describe("HeartbeatsStore tests", () => {
   describe("healthy endpoints", () => {
     describe("total number when tracking instances", () => {
       test("when all instances are heart beating", async () => {
-        const defaultEndpointsView = <EndpointsView>{ is_sending_heartbeats: true, id: "", name: "", monitor_heartbeat: true, host_display_name: "", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" } };
+        const defaultEndpointsView = <EndpointsView>{
+          is_sending_heartbeats: true,
+          id: "",
+          name: "",
+          monitor_heartbeat: true,
+          host_display_name: "",
+          heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" },
+        };
         const { healthyEndpoints } = await setup(
           [
             { ...defaultEndpointsView, ...(<Partial<EndpointsView>>{ name: "John" }) },
@@ -142,7 +184,14 @@ describe("HeartbeatsStore tests", () => {
       });
 
       test("when some instances are not heart beating", async () => {
-        const defaultEndpointsView = <EndpointsView>{ is_sending_heartbeats: true, id: "", name: "", monitor_heartbeat: true, host_display_name: "", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" } };
+        const defaultEndpointsView = <EndpointsView>{
+          is_sending_heartbeats: true,
+          id: "",
+          name: "",
+          monitor_heartbeat: true,
+          host_display_name: "",
+          heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" },
+        };
         const { healthyEndpoints } = await setup(
           [
             { ...defaultEndpointsView, ...(<Partial<EndpointsView>>{ name: "John" }) },
@@ -160,7 +209,14 @@ describe("HeartbeatsStore tests", () => {
 
     describe("total number when not tracking instances", () => {
       test("when all instances are heart beating", async () => {
-        const defaultEndpointsView = <EndpointsView>{ is_sending_heartbeats: true, id: "", name: "", monitor_heartbeat: true, host_display_name: "", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" } };
+        const defaultEndpointsView = <EndpointsView>{
+          is_sending_heartbeats: true,
+          id: "",
+          name: "",
+          monitor_heartbeat: true,
+          host_display_name: "",
+          heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" },
+        };
         const { healthyEndpoints } = await setup(
           [
             { ...defaultEndpointsView, ...(<Partial<EndpointsView>>{ name: "John" }) },
@@ -175,7 +231,14 @@ describe("HeartbeatsStore tests", () => {
       });
 
       test("when some instances are not heart beating", async () => {
-        const defaultEndpointsView = <EndpointsView>{ is_sending_heartbeats: true, id: "", name: "", monitor_heartbeat: true, host_display_name: "", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" } };
+        const defaultEndpointsView = <EndpointsView>{
+          is_sending_heartbeats: true,
+          id: "",
+          name: "",
+          monitor_heartbeat: true,
+          host_display_name: "",
+          heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" },
+        };
         const { healthyEndpoints } = await setup(
           [
             { ...defaultEndpointsView, ...(<Partial<EndpointsView>>{ name: "John" }) },
@@ -192,7 +255,14 @@ describe("HeartbeatsStore tests", () => {
     });
 
     test("filter by name", async () => {
-      const defaultEndpointsView = <EndpointsView>{ is_sending_heartbeats: true, id: "", name: "", monitor_heartbeat: true, host_display_name: "", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" } };
+      const defaultEndpointsView = <EndpointsView>{
+        is_sending_heartbeats: true,
+        id: "",
+        name: "",
+        monitor_heartbeat: true,
+        host_display_name: "",
+        heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" },
+      };
       const { filteredHealthyEndpoints, endpointFilterString } = await setup(
         [
           { ...defaultEndpointsView, ...(<Partial<EndpointsView>>{ name: "John" }) },
@@ -210,7 +280,14 @@ describe("HeartbeatsStore tests", () => {
     });
 
     test("sort by", async () => {
-      const defaultEndpointsView = <EndpointsView>{ is_sending_heartbeats: true, id: "", name: "", monitor_heartbeat: true, host_display_name: "", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" } };
+      const defaultEndpointsView = <EndpointsView>{
+        is_sending_heartbeats: true,
+        id: "",
+        name: "",
+        monitor_heartbeat: true,
+        host_display_name: "",
+        heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" },
+      };
       const { filteredHealthyEndpoints, sortByInstances } = await setup(
         [
           { ...defaultEndpointsView, ...(<Partial<EndpointsView>>{ name: "John", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "2024-10-01T00:00:00" } }) },
@@ -257,7 +334,14 @@ describe("HeartbeatsStore tests", () => {
   describe("unhealthy endpoints", () => {
     describe("total number when tracking instances", () => {
       test("when all instances are heart beating", async () => {
-        const defaultEndpointsView = <EndpointsView>{ is_sending_heartbeats: false, id: "", name: "", monitor_heartbeat: true, host_display_name: "", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" } };
+        const defaultEndpointsView = <EndpointsView>{
+          is_sending_heartbeats: false,
+          id: "",
+          name: "",
+          monitor_heartbeat: true,
+          host_display_name: "",
+          heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" },
+        };
         const { unhealthyEndpoints } = await setup(
           [
             { ...defaultEndpointsView, ...(<Partial<EndpointsView>>{ name: "John" }) },
@@ -272,7 +356,14 @@ describe("HeartbeatsStore tests", () => {
       });
 
       test("when some instances are not heart beating", async () => {
-        const defaultEndpointsView = <EndpointsView>{ is_sending_heartbeats: false, id: "", name: "", monitor_heartbeat: true, host_display_name: "", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" } };
+        const defaultEndpointsView = <EndpointsView>{
+          is_sending_heartbeats: false,
+          id: "",
+          name: "",
+          monitor_heartbeat: true,
+          host_display_name: "",
+          heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" },
+        };
         const { unhealthyEndpoints } = await setup(
           [
             { ...defaultEndpointsView, ...(<Partial<EndpointsView>>{ name: "John" }) },
@@ -290,7 +381,14 @@ describe("HeartbeatsStore tests", () => {
 
     describe("total number when not tracking instances", () => {
       test("when all instances are heart beating", async () => {
-        const defaultEndpointsView = <EndpointsView>{ is_sending_heartbeats: true, id: "", name: "", monitor_heartbeat: true, host_display_name: "", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" } };
+        const defaultEndpointsView = <EndpointsView>{
+          is_sending_heartbeats: true,
+          id: "",
+          name: "",
+          monitor_heartbeat: true,
+          host_display_name: "",
+          heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" },
+        };
         const { unhealthyEndpoints } = await setup(
           [
             { ...defaultEndpointsView, ...(<Partial<EndpointsView>>{ name: "John" }) },
@@ -305,7 +403,14 @@ describe("HeartbeatsStore tests", () => {
       });
 
       test("when some instances are not heart beating", async () => {
-        const defaultEndpointsView = <EndpointsView>{ is_sending_heartbeats: false, id: "", name: "", monitor_heartbeat: true, host_display_name: "", heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" } };
+        const defaultEndpointsView = <EndpointsView>{
+          is_sending_heartbeats: false,
+          id: "",
+          name: "",
+          monitor_heartbeat: true,
+          host_display_name: "",
+          heartbeat_information: { reported_status: EndpointStatus.Alive, last_report_at: "" },
+        };
         const { unhealthyEndpoints } = await setup(
           [
             { ...defaultEndpointsView, ...(<Partial<EndpointsView>>{ name: "Henry" }) },
diff --git a/src/Frontend/src/views/ConfigurationView.vue b/src/Frontend/src/views/ConfigurationView.vue
index d87a82f1b7..88dd00ae0e 100644
--- a/src/Frontend/src/views/ConfigurationView.vue
+++ b/src/Frontend/src/views/ConfigurationView.vue
@@ -66,6 +66,9 @@ function preventIfDisabled(e: Event) {
             <exclamation-mark :type="WarningLevel.Danger" v-if="hasErrors" />
           </h5>
           <template v-if="!licenseStatus.isExpired">
+            <h5 :class="{ active: isRouteSelected(routeLinks.configuration.massTransitConnector.link), disabled: notConnected }" @click.capture="preventIfDisabled" class="nav-item">
+              <RouterLink :to="routeLinks.configuration.massTransitConnector.link">MassTransit Connector</RouterLink>
+            </h5>
             <h5 :class="{ active: isRouteSelected(routeLinks.configuration.healthCheckNotifications.link), disabled: notConnected }" @click.capture="preventIfDisabled" class="nav-item">
               <RouterLink :to="routeLinks.configuration.healthCheckNotifications.link">Health Check Notifications</RouterLink>
             </h5>
diff --git a/src/Frontend/src/views/DashboardView.vue b/src/Frontend/src/views/DashboardView.vue
index 39f00c7c83..e8d661439d 100644
--- a/src/Frontend/src/views/DashboardView.vue
+++ b/src/Frontend/src/views/DashboardView.vue
@@ -22,13 +22,13 @@ import FailedMessagesDashboardItem from "@/components/failedmessages/FailedMessa
             <div class="row box system-status">
               <div class="col-12">
                 <div class="row">
-                  <div class="col-4">
+                  <div class="system-status-item">
                     <HeartbeatsDashboardItem />
                   </div>
-                  <div class="col-4">
+                  <div class="system-status-item">
                     <FailedMessagesDashboardItem />
                   </div>
-                  <div class="col-4">
+                  <div class="system-status-item">
                     <CustomChecksDashboardItem />
                   </div>
                 </div>
@@ -48,4 +48,12 @@ import FailedMessagesDashboardItem from "@/components/failedmessages/FailedMessa
   border-color: #eee !important;
   cursor: default;
 }
+
+.system-status .row {
+  display: flex;
+}
+
+.system-status-item {
+  flex: 1;
+}
 </style>
diff --git a/src/Frontend/src/views/HeartbeatsView.vue b/src/Frontend/src/views/HeartbeatsView.vue
index ac11a587f4..d7494040e7 100644
--- a/src/Frontend/src/views/HeartbeatsView.vue
+++ b/src/Frontend/src/views/HeartbeatsView.vue
@@ -7,9 +7,12 @@ import { storeToRefs } from "pinia";
 import ServiceControlAvailable from "@/components/ServiceControlAvailable.vue";
 import LicenseNotExpired from "@/components/LicenseNotExpired.vue";
 import FilterInput from "@/components/FilterInput.vue";
+import { useIsMassTransitConnected } from "@/composables/useIsMassTransitConnected";
 
 const store = useHeartbeatsStore();
 const { unhealthyEndpoints, healthyEndpoints, endpointFilterString } = storeToRefs(store);
+
+const isMassTransitConnected = useIsMassTransitConnected();
 </script>
 
 <template>
@@ -20,6 +23,9 @@ const { unhealthyEndpoints, healthyEndpoints, endpointFilterString } = storeToRe
           <div class="col-12">
             <h1>Endpoint Heartbeats</h1>
           </div>
+          <div class="col-12" v-if="isMassTransitConnected">
+            <div class="alert alert-info">MassTransit endpoints are currently not supported by heartbeat functionality and will not show in this view.</div>
+          </div>
         </div>
         <div class="row">
           <div class="col-sm-12">
diff --git a/src/ServicePulse/ConstantsFile.cs b/src/ServicePulse/ConstantsFile.cs
index c68d0a7211..4b95452b40 100644
--- a/src/ServicePulse/ConstantsFile.cs
+++ b/src/ServicePulse/ConstantsFile.cs
@@ -19,7 +19,7 @@ public static string GetContent(Settings settings)
         else
         {
             serviceControlUrl = settings.ServiceControlUri.ToString();
-            monitoringUrl = settings.MonitoringUri.ToString();
+            monitoringUrl = settings.MonitoringUri?.ToString() ?? "!";
         }
 
         var constantsFile = $$"""
diff --git a/src/ServicePulse/ReverseProxy.cs b/src/ServicePulse/ReverseProxy.cs
index 6fe8b96047..90ccc591d9 100644
--- a/src/ServicePulse/ReverseProxy.cs
+++ b/src/ServicePulse/ReverseProxy.cs
@@ -7,6 +7,9 @@ static class ReverseProxy
 {
     public static (List<RouteConfig> routes, List<ClusterConfig> clusters) GetConfiguration(Settings settings)
     {
+        var routes = new List<RouteConfig>();
+        var clusters = new List<ClusterConfig>();
+
         var serviceControlInstance = new ClusterConfig
         {
             ClusterId = "serviceControlInstance",
@@ -15,17 +18,7 @@ public static (List<RouteConfig> routes, List<ClusterConfig> clusters) GetConfig
                 { "instance", new DestinationConfig { Address = settings.ServiceControlUri.ToString() } }
             }
         };
-
-        var monitoringInstance = new ClusterConfig
-        {
-            ClusterId = "monitoringInstance",
-            Destinations = new Dictionary<string, DestinationConfig>
-            {
-                { "instance", new DestinationConfig { Address = settings.MonitoringUri.ToString() } }
-            }
-        };
-
-        var serviceControlRoute = new RouteConfig()
+        var serviceControlRoute = new RouteConfig
         {
             RouteId = "serviceControlRoute",
             ClusterId = nameof(serviceControlInstance),
@@ -35,27 +28,30 @@ public static (List<RouteConfig> routes, List<ClusterConfig> clusters) GetConfig
             }
         }.WithTransformPathRemovePrefix("/api");
 
-        var monitoringRoute = new RouteConfig()
-        {
-            RouteId = "monitoringRoute",
-            ClusterId = nameof(monitoringInstance),
-            Match = new RouteMatch
-            {
-                Path = "/monitoring-api/{**catch-all}"
-            }
-        }.WithTransformPathRemovePrefix("/monitoring-api");
-
-        var routes = new List<RouteConfig>
-        {
-            serviceControlRoute,
-            monitoringRoute
-        };
+        clusters.Add(serviceControlInstance);
+        routes.Add(serviceControlRoute);
 
-        var clusters = new List<ClusterConfig>
+        if (settings.MonitoringUri != null)
         {
-            serviceControlInstance,
-            monitoringInstance
-        };
+            var monitoringInstance = new ClusterConfig
+            {
+                ClusterId = "monitoringInstance",
+                Destinations = new Dictionary<string, DestinationConfig>
+                {
+                    { "instance", new DestinationConfig { Address = settings.MonitoringUri.ToString() } }
+                }
+            };
+
+            var monitoringRoute = new RouteConfig
+            {
+                RouteId = "monitoringRoute",
+                ClusterId = nameof(monitoringInstance),
+                Match = new RouteMatch { Path = "/monitoring-api/{**catch-all}" }
+            }.WithTransformPathRemovePrefix("/monitoring-api");
+
+            clusters.Add(monitoringInstance);
+            routes.Add(monitoringRoute);
+        }
 
         return (routes, clusters);
     }
diff --git a/src/ServicePulse/ServicePulse.csproj b/src/ServicePulse/ServicePulse.csproj
index 820608dbc6..9c7c7d1cef 100644
--- a/src/ServicePulse/ServicePulse.csproj
+++ b/src/ServicePulse/ServicePulse.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
diff --git a/src/ServicePulse/Settings.cs b/src/ServicePulse/Settings.cs
index 392eff8481..51717b5cbe 100644
--- a/src/ServicePulse/Settings.cs
+++ b/src/ServicePulse/Settings.cs
@@ -6,7 +6,7 @@ class Settings
 {
     public required Uri ServiceControlUri { get; init; }
 
-    public required Uri MonitoringUri { get; init; }
+    public required Uri? MonitoringUri { get; init; }
 
     public required string DefaultRoute { get; init; }
 
@@ -36,7 +36,7 @@ public static Settings GetFromEnvironmentVariables()
         monitoringUrl ??= monitoringUrls;
         monitoringUrl ??= "http://localhost:33633/";
 
-        var monitoringUri = new Uri(monitoringUrl);
+        var monitoringUri = monitoringUrl == "!" ? null : new Uri(monitoringUrl);
 
         var defaultRoute = Environment.GetEnvironmentVariable("DEFAULT_ROUTE") ?? "/dashboard";