diff --git a/webcomponents/tool/src/main/frontend/js/rubrics/sakai-item-delete.js b/webcomponents/tool/src/main/frontend/js/rubrics/sakai-item-delete.js
index 04b4aa7cc2c1..4dd60fe63059 100644
--- a/webcomponents/tool/src/main/frontend/js/rubrics/sakai-item-delete.js
+++ b/webcomponents/tool/src/main/frontend/js/rubrics/sakai-item-delete.js
@@ -197,4 +197,6 @@ export class SakaiItemDelete extends RubricsElement {
   }
 }
 
-customElements.define("sakai-item-delete", SakaiItemDelete);
+if (!customElements.get("sakai-item-delete")) {
+  customElements.define("sakai-item-delete", SakaiItemDelete);
+}
diff --git a/webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-criteria.js b/webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-criteria.js
index 696dd3bf1872..5123384a1c02 100644
--- a/webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-criteria.js
+++ b/webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-criteria.js
@@ -6,7 +6,7 @@ import {SakaiItemDelete} from "./sakai-item-delete.js";
 import {SakaiRubricCriterionEdit} from "./sakai-rubric-criterion-edit.js";
 import {SakaiRubricCriterionRatingEdit} from "./sakai-rubric-criterion-rating-edit.js";
 import {SharingChangeEvent} from "./sharing-change-event.js";
-import * as Unused from "/webcomponents/assets/sortablejs/Sortable.js";
+import { Sortable } from "/webcomponents/assets/sortablejs/modular/sortable.esm.js";
 import {tr} from "./sakai-rubrics-language.js";
 
 export class SakaiRubricCriteria extends RubricsElement {
diff --git a/webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-edit.js b/webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-edit.js
index 1413e155de8b..3644e769b073 100644
--- a/webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-edit.js
+++ b/webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-edit.js
@@ -151,4 +151,6 @@ export class SakaiRubricEdit extends RubricsElement {
   }
 }
 
-customElements.define("sakai-rubric-edit", SakaiRubricEdit);
+if (!customElements.get("sakai-rubric-edit")) {
+  customElements.define("sakai-rubric-edit", SakaiRubricEdit);
+}