diff --git a/aleksis/apps/chronos/frontend/components/amendLesson.graphql b/aleksis/apps/chronos/frontend/components/amendLesson.graphql
index 79b44b37bbbfa28e4de0ae22e4d15b16a2298d8f..7978f9448d9712412ad75f13e2e77740fd418189 100644
--- a/aleksis/apps/chronos/frontend/components/amendLesson.graphql
+++ b/aleksis/apps/chronos/frontend/components/amendLesson.graphql
@@ -2,6 +2,8 @@ query gqlSubjects {
   amendableSubjects: subjects {
     id
     name
+    colourFg
+    colourBg
   }
 }
 
diff --git a/aleksis/apps/chronos/frontend/components/substitutions/SubstitutionCard.vue b/aleksis/apps/chronos/frontend/components/substitutions/SubstitutionCard.vue
index 618ee11a6c9d5bfbfe625dedb214d461ff4bce36..f520df332c907895128e8f102c2074c528a03168 100644
--- a/aleksis/apps/chronos/frontend/components/substitutions/SubstitutionCard.vue
+++ b/aleksis/apps/chronos/frontend/components/substitutions/SubstitutionCard.vue
@@ -1,9 +1,9 @@
 <script setup>
 import SubstitutionInformation from "./SubstitutionInformation.vue";
 import TeacherField from "aleksis.apps.cursus/components/TeacherField.vue";
-import SubjectField from "aleksis.apps.cursus/components/SubjectField.vue";
+import SubjectChipSelectField from "aleksis.apps.cursus/components/SubjectChipSelectField.vue";
 
-import { gqlRooms } from "../amendLesson.graphql";
+import { gqlRooms, gqlSubjects } from "../amendLesson.graphql";
 
 import createOrPatchMixin from "aleksis.core/mixins/createOrPatchMixin.js";
 import deleteMixin from "aleksis.core/mixins/deleteMixin.js";
@@ -23,14 +23,10 @@ import deleteMixin from "aleksis.core/mixins/deleteMixin.js";
 
       <v-spacer />
 
-      <subject-field
-        :enable-create="false"
-        dense
-        outlined
-        hide-details
+      <subject-chip-select-field
         :value="subject"
         :disabled="loading"
-        :label="$t('chronos.substitutions.overview.subject.label')"
+        :items="amendableSubjects"
         @input="subjectInput"
       />
 
@@ -396,6 +392,7 @@ export default {
   },
   apollo: {
     amendableRooms: gqlRooms,
+    amendableSubjects: gqlSubjects,
   },
 };
 </script>