diff --git a/src/GroupDetails.vue b/src/GroupDetails.vue
index 0aac66c7..ec9561c4 100644
--- a/src/GroupDetails.vue
+++ b/src/GroupDetails.vue
@@ -116,13 +116,17 @@ export default {
 		UserTable,
 		NcIconSvgWrapper,
 	},
+	setup() {
+		return {
+			isDarkTheme: useIsDarkTheme(),
+		}
+	},
 	data() {
 		return {
 			showRenameGroupInput: false, // true to display 'Rename Group' NcActionInput
 			showSelectUsersModal: false, // true to display user selection Modal windows
 			showRemoveConnectedGroupModal: false,
 			showRemoveGroupModal: false,
-			isDarkTheme: useIsDarkTheme(),
 			mdiAccountMultiple,
 			AddedGroupBlack,
 			AddedGroupWhite,
diff --git a/src/GroupMenuItem.vue b/src/GroupMenuItem.vue
index da27b72a..d6a00832 100644
--- a/src/GroupMenuItem.vue
+++ b/src/GroupMenuItem.vue
@@ -53,9 +53,13 @@ export default {
 			default: 0,
 		},
 	},
-	data() {
+	setup() {
 		return {
 			isDarkTheme: useIsDarkTheme(),
+		}
+	},
+	data() {
+		return {
 			mdiAccountMultiple,
 			AddedGroupBlack,
 			AddedGroupWhite,
diff --git a/src/SpaceDetails.vue b/src/SpaceDetails.vue
index cfe6819c..9bbda5ce 100644
--- a/src/SpaceDetails.vue
+++ b/src/SpaceDetails.vue
@@ -160,6 +160,11 @@ export default {
 	directives: {
 		Tooltip,
 	},
+	setup() {
+		return {
+			isDarkTheme: useIsDarkTheme(),
+		}
+	},
 	data() {
 		return {
 			createGroup: false, // true to display 'Create Group' ActionInput
@@ -175,7 +180,7 @@ export default {
 			AddedGroupBlack,
 			AddedGroupWhite,
 			iconUrl: undefined,
-			isDarkTheme: useIsDarkTheme(),
+			// isDarkTheme: useIsDarkTheme(),
 		}
 	},
 	computed: {