diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5dc0dc3..094b896f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Improved the usability of the toggle component
 - Switched to the accounts endpoint in the holding detail dialog
 
 ## 2.107.1 - 2024-09-12
diff --git a/apps/client/src/app/components/toggle/toggle.component.html b/apps/client/src/app/components/toggle/toggle.component.html
index 4a6e0fc3..ac2256da 100644
--- a/apps/client/src/app/components/toggle/toggle.component.html
+++ b/apps/client/src/app/components/toggle/toggle.component.html
@@ -7,7 +7,10 @@
     <mat-radio-button
       class="d-inline-flex"
       [disabled]="isLoading"
-      [ngClass]="{ 'cursor-pointer': !isLoading }"
+      [ngClass]="{
+        'cursor-default': option.value === optionFormControl.value,
+        'cursor-pointer': !isLoading && option.value !== optionFormControl.value
+      }"
       [value]="option.value"
       >{{ option.label }}</mat-radio-button
     >