diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index c4a8e802d..e4320b5eb 100644
Binary files a/netbox/project-static/dist/netbox.js and b/netbox/project-static/dist/netbox.js differ
diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map
index b95e6ba02..83235b352 100644
Binary files a/netbox/project-static/dist/netbox.js.map and b/netbox/project-static/dist/netbox.js.map differ
diff --git a/netbox/project-static/package.json b/netbox/project-static/package.json
index 6b046c8fc..4ec08d7b3 100644
--- a/netbox/project-static/package.json
+++ b/netbox/project-static/package.json
@@ -30,6 +30,7 @@
     "cookie": "^0.4.1",
     "dayjs": "^1.10.4",
     "flatpickr": "4.6.3",
+    "htmx.org": "^1.6.1",
     "just-debounce-it": "^1.4.0",
     "masonry-layout": "^4.2.2",
     "query-string": "^6.14.1",
diff --git a/netbox/project-static/src/index.ts b/netbox/project-static/src/index.ts
index 30c25a406..266e69d6d 100644
--- a/netbox/project-static/src/index.ts
+++ b/netbox/project-static/src/index.ts
@@ -1,4 +1,5 @@
 import '@popperjs/core';
 import 'bootstrap';
+import 'htmx.org';
 import 'simplebar';
 import './netbox';
diff --git a/netbox/project-static/yarn.lock b/netbox/project-static/yarn.lock
index 9dfc0a3b3..780ba071e 100644
--- a/netbox/project-static/yarn.lock
+++ b/netbox/project-static/yarn.lock
@@ -1688,6 +1688,11 @@ hosted-git-info@^2.1.4, hosted-git-info@^2.8.9:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
+htmx.org@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/htmx.org/-/htmx.org-1.6.1.tgz#6f0d59a93fa61cbaa15316c134a2f179045a5778"
+  integrity sha512-i+1k5ee2eFWaZbomjckyrDjUpa3FMDZWufatUSBmmsjXVksn89nsXvr1KLGIdAajiz+ZSL7TE4U/QaZVd2U2sA==
+
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
diff --git a/netbox/templates/base/base.html b/netbox/templates/base/base.html
index 52d9c6603..43e5c2dfb 100644
--- a/netbox/templates/base/base.html
+++ b/netbox/templates/base/base.html
@@ -160,9 +160,6 @@
       })();
     </script>
 
-    {# TODO: Package HTMX JS locally #}
-    <script src="https://unpkg.com/htmx.org@1.6.1"></script>
-
     {# Page layout #}
     {% block layout %}{% endblock %}