diff --git a/client/src/components/Tool/ToolSuccess.vue b/client/src/components/Tool/ToolSuccess.vue
index 9f039b71598..76a3613a7a2 100644
--- a/client/src/components/Tool/ToolSuccess.vue
+++ b/client/src/components/Tool/ToolSuccess.vue
@@ -1,10 +1,12 @@
 <script setup lang="ts">
+import { BAlert } from "bootstrap-vue";
 import { computed, onMounted } from "vue";
 import { useRouter } from "vue-router/composables";
 
 import { useConfig } from "@/composables/config";
 import { useJobStore } from "@/stores/jobStore";
 
+import LoadingSpan from "../LoadingSpan.vue";
 import ToolRecommendation from "../ToolRecommendation.vue";
 import ToolSuccessMessage from "./ToolSuccessMessage.vue";
 import Webhook from "@/components/Common/Webhook.vue";
@@ -31,10 +33,15 @@ onMounted(() => {
 
 <template>
     <section>
-        <div v-if="jobResponse.produces_entry_points">
-            <ToolEntryPoints v-for="job in jobResponse.jobs" :key="job.id" :job-id="job.id" />
+        <BAlert v-if="!jobResponse" variant="info" show>
+            <LoadingSpan message="Waiting on a job response" />
+        </BAlert>
+        <div v-else>
+            <div v-if="jobResponse?.produces_entry_points">
+                <ToolEntryPoints v-for="job in jobResponse.jobs" :key="job.id" :job-id="job.id" />
+            </div>
+            <ToolSuccessMessage :job-response="jobResponse" :tool-name="toolName" />
         </div>
-        <ToolSuccessMessage :job-response="jobResponse" :tool-name="toolName" />
         <Webhook type="tool" :tool-id="jobDef.tool_id" />
         <ToolRecommendation v-if="showRecommendation" :tool-id="jobDef.tool_id" />
     </section>