diff --git a/src/Frontend/src/views/throughputreport/EndpointsView.spec.ts b/src/Frontend/src/views/throughputreport/EndpointsView.spec.ts
index 3d44e61b0..b93b7c0ba 100644
--- a/src/Frontend/src/views/throughputreport/EndpointsView.spec.ts
+++ b/src/Frontend/src/views/throughputreport/EndpointsView.spec.ts
@@ -44,20 +44,20 @@ describe("EndpointsView tests", () => {
     return { debug, driver };
   }
 
-  test("instructions by default are showing", async () => {
+  test("instructions by default are not showing", async () => {
     await renderComponent();
 
-    expect(screen.queryByText(/Hide Endpoint Types meaning/i)).toBeInTheDocument();
+    expect(screen.queryByText(/Show Endpoint Types meaning/i)).toBeInTheDocument();
   });
 
-  test("hide instructions", async () => {
+  test("show instructions", async () => {
     await renderComponent();
 
     const use = userEvent.setup();
 
-    await use.click(screen.getByRole("link", { name: /Hide Endpoint Types meaning/i }));
+    await use.click(screen.getByRole("link", { name: /Show Endpoint Types meaning/i }));
 
-    expect(screen.queryByText(/Show Endpoint Types meaning/i)).toBeInTheDocument();
+    expect(screen.queryByText(/Hide Endpoint Types meaning/i)).toBeInTheDocument();
   });
 
   test("broker displays the two tabs", async () => {
diff --git a/src/Frontend/src/views/throughputreport/EndpointsView.vue b/src/Frontend/src/views/throughputreport/EndpointsView.vue
index d81d03ee3..0a7dab673 100644
--- a/src/Frontend/src/views/throughputreport/EndpointsView.vue
+++ b/src/Frontend/src/views/throughputreport/EndpointsView.vue
@@ -12,9 +12,11 @@ import LegendTransactionalSessionProcessorEndpoint from "./LegendTransactionalSe
 import LegendSendOnlyEndpoint from "./LegendSendOnlyEndpoint.vue";
 import LegendPlannedToDecommission from "./LegendPlannedToDecommission.vue";
 import LegendNotNServiceBusEndpoint from "./LegendNotNServiceBusEndpoint.vue";
+import LegendGatewayOrBridgeEndpoint from "./LegendGatewayOrBridgeEndpoint.vue";
+import LegendParticularPlatformEndpoint from "./LegendParticularPlatformEndpoint.vue";
 
 const { isBrokerTransport } = storeToRefs(useThroughputStore());
-const showLegend = ref(true);
+const showLegend = ref(false);
 
 const legendOptions = new Map<UserIndicator, Component>([
   [UserIndicator.NServiceBusEndpoint, LegendNServiceBusEndpoint],
@@ -23,6 +25,8 @@ const legendOptions = new Map<UserIndicator, Component>([
   [UserIndicator.SendOnlyEndpoint, LegendSendOnlyEndpoint],
   [UserIndicator.PlannedToDecommission, LegendPlannedToDecommission],
   [UserIndicator.NotNServiceBusEndpoint, LegendNotNServiceBusEndpoint],
+  [UserIndicator.GatewayOrBridgingEndpoint, LegendGatewayOrBridgeEndpoint],
+  [UserIndicator.ParticularPlatformEndpoint, LegendParticularPlatformEndpoint],
 ]);
 
 function toggleOptionsLegendVisible() {
diff --git a/src/Frontend/src/views/throughputreport/LegendGatewayOrBridgeEndpoint.vue b/src/Frontend/src/views/throughputreport/LegendGatewayOrBridgeEndpoint.vue
new file mode 100644
index 000000000..40cae6e92
--- /dev/null
+++ b/src/Frontend/src/views/throughputreport/LegendGatewayOrBridgeEndpoint.vue
@@ -0,0 +1,6 @@
+<template>
+  <span>
+    This is either part of the <a href="https://docs.particular.net/nservicebus/gateway" target="_blank">Gateway</a> infrastructure or part of the
+    <a href="https://docs.particular.net/nservicebus/bridge" target="_blank">Messaging Bridge</a> infrastructure.
+  </span>
+</template>
diff --git a/src/Frontend/src/views/throughputreport/LegendParticularPlatformEndpoint.vue b/src/Frontend/src/views/throughputreport/LegendParticularPlatformEndpoint.vue
new file mode 100644
index 000000000..a14e5bb52
--- /dev/null
+++ b/src/Frontend/src/views/throughputreport/LegendParticularPlatformEndpoint.vue
@@ -0,0 +1,3 @@
+<template>
+  <span>This is an infrastructure endpoint used by the Particular Platform</span>
+</template>
diff --git a/src/Frontend/src/views/throughputreport/endpoints/DetectedBrokerQueuesView.vue b/src/Frontend/src/views/throughputreport/endpoints/DetectedBrokerQueuesView.vue
index 34c10162e..b2a990995 100644
--- a/src/Frontend/src/views/throughputreport/endpoints/DetectedBrokerQueuesView.vue
+++ b/src/Frontend/src/views/throughputreport/endpoints/DetectedBrokerQueuesView.vue
@@ -31,6 +31,8 @@ const { testResults } = storeToRefs(store);
       UserIndicator.SendOnlyEndpoint,
       UserIndicator.NServiceBusEndpointNoLongerInUse,
       UserIndicator.PlannedToDecommission,
+      UserIndicator.GatewayOrBridgingEndpoint,
+      UserIndicator.ParticularPlatformEndpoint,
     ]"
     :source="DataSource.Broker"
     column-title="Queue Name"
diff --git a/src/Frontend/src/views/throughputreport/endpoints/DetectedEndpointsView.vue b/src/Frontend/src/views/throughputreport/endpoints/DetectedEndpointsView.vue
index 3f5bad574..05984d089 100644
--- a/src/Frontend/src/views/throughputreport/endpoints/DetectedEndpointsView.vue
+++ b/src/Frontend/src/views/throughputreport/endpoints/DetectedEndpointsView.vue
@@ -25,7 +25,15 @@ const { isBrokerTransport, hasErrors } = storeToRefs(useThroughputStore());
   </template>
   <DetectedListView
     ariaLabel="Detected endpoints"
-    :indicator-options="[UserIndicator.NServiceBusEndpoint, UserIndicator.TransactionalSessionProcessorEndpoint, UserIndicator.SendOnlyEndpoint, UserIndicator.NServiceBusEndpointNoLongerInUse, UserIndicator.PlannedToDecommission]"
+    :indicator-options="[
+      UserIndicator.NServiceBusEndpoint,
+      UserIndicator.TransactionalSessionProcessorEndpoint,
+      UserIndicator.SendOnlyEndpoint,
+      UserIndicator.NServiceBusEndpointNoLongerInUse,
+      UserIndicator.PlannedToDecommission,
+      UserIndicator.GatewayOrBridgingEndpoint,
+      UserIndicator.ParticularPlatformEndpoint,
+    ]"
     :source="DataSource.WellKnownEndpoint"
     column-title="Endpoint Name"
     :show-endpoint-type-placeholder="false"
diff --git a/src/Frontend/src/views/throughputreport/endpoints/userIndicator.ts b/src/Frontend/src/views/throughputreport/endpoints/userIndicator.ts
index a0e757d50..e0d1199d2 100644
--- a/src/Frontend/src/views/throughputreport/endpoints/userIndicator.ts
+++ b/src/Frontend/src/views/throughputreport/endpoints/userIndicator.ts
@@ -5,4 +5,6 @@ export enum UserIndicator {
   SendOnlyEndpoint = "SendOnlyEndpoint",
   NServiceBusEndpointNoLongerInUse = "NServiceBusEndpointNoLongerInUse",
   PlannedToDecommission = "PlannedToDecommission",
+  GatewayOrBridgingEndpoint = "GatewayOrBridgingEndpoint",
+  ParticularPlatformEndpoint = "ParticularPlatformEndpoint",
 }
diff --git a/src/Frontend/src/views/throughputreport/endpoints/userIndicatorMapper.ts b/src/Frontend/src/views/throughputreport/endpoints/userIndicatorMapper.ts
index 22baa08bf..09f5c8d0d 100644
--- a/src/Frontend/src/views/throughputreport/endpoints/userIndicatorMapper.ts
+++ b/src/Frontend/src/views/throughputreport/endpoints/userIndicatorMapper.ts
@@ -7,4 +7,6 @@ export const userIndicatorMapper = new Map<UserIndicator, string>([
   [UserIndicator.SendOnlyEndpoint, "Send-Only Endpoint"],
   [UserIndicator.PlannedToDecommission, "Planned to be decommissioned"],
   [UserIndicator.NotNServiceBusEndpoint, "Not an NServiceBus Endpoint"],
+  [UserIndicator.GatewayOrBridgingEndpoint, "Gateway or Bridging Endpoint"],
+  [UserIndicator.ParticularPlatformEndpoint, "Particular Platform Infrastructure Endpoint"],
 ]);