diff --git a/netbox/project-static/dist/jobs.js b/netbox/project-static/dist/jobs.js
index 9d2865210..47bcf9c14 100644
Binary files a/netbox/project-static/dist/jobs.js and b/netbox/project-static/dist/jobs.js differ
diff --git a/netbox/project-static/dist/jobs.js.map b/netbox/project-static/dist/jobs.js.map
index 1c58823d1..075a1ed31 100644
Binary files a/netbox/project-static/dist/jobs.js.map and b/netbox/project-static/dist/jobs.js.map differ
diff --git a/netbox/project-static/src/jobs.ts b/netbox/project-static/src/jobs.ts
index cc3fb8494..319910a1e 100644
--- a/netbox/project-static/src/jobs.ts
+++ b/netbox/project-static/src/jobs.ts
@@ -1,5 +1,5 @@
 import { createToast } from './bs';
-import { apiGetBase, hasError } from './util';
+import { apiGetBase, hasError, getNetboxData } from './util';
 
 let timeout: number = 1000;
 
@@ -21,19 +21,14 @@ function asyncTimeout(ms: number) {
  * JavaScript.
  */
 function getJobInfo(): JobInfo {
-  let id: Nullable<string> = null;
   let complete = false;
 
-  // Determine the Job ID, if present.
-  const jobIdElement = document.getElementById('jobId');
-  if (jobIdElement !== null && jobIdElement.getAttribute('data-value')) {
-    id = jobIdElement.getAttribute('data-value');
-  }
+  const id = getNetboxData('data-job-id');
+  const jobComplete = getNetboxData('data-job-complete');
 
   // Determine the job completion status, if present. If the job is not complete, the value will be
   // "None". Otherwise, it will be a stringified date.
-  const jobCompleteElement = document.getElementById('jobComplete');
-  if (jobCompleteElement !== null && jobCompleteElement.getAttribute('data-value') !== 'None') {
+  if (typeof jobComplete === 'string' && jobComplete.toLowerCase() !== 'none') {
     complete = true;
   }
   return { id, complete };
@@ -91,6 +86,7 @@ async function checkJobStatus(id: string) {
 
 function initJobs() {
   const { id, complete } = getJobInfo();
+
   if (id !== null && !complete) {
     // If there is a job ID and it is not completed, check for the job's status.
     Promise.resolve(checkJobStatus(id));