diff --git a/locales/en-US.yml b/locales/en-US.yml
index 3fd04d50e..da1bc388f 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -322,6 +322,7 @@ dark: "Dark"
 lightThemes: "Light themes"
 darkThemes: "Dark themes"
 syncDeviceDarkMode: "Sync Dark Mode with your device settings"
+rickRollDetect: "Rick Roll Detection"
 drive: "Drive"
 fileName: "Filename"
 selectFile: "Select a file"
diff --git a/packages/client/src/pages/settings/theme.vue b/packages/client/src/pages/settings/theme.vue
index 2981cec0a..5fe5d99b7 100644
--- a/packages/client/src/pages/settings/theme.vue
+++ b/packages/client/src/pages/settings/theme.vue
@@ -142,6 +142,11 @@
 			>
 		</FormSection>
 
+		<FormSwitch v-model="syncDeviceDarkMode">{{
+					i18n.ts.rickRollDetect
+				}}
+		</FormSwitch>
+
 		<FormButton
 			v-if="wallpaper == null"
 			class="_formBlock"
@@ -237,6 +242,9 @@ const darkMode = computed(defaultStore.makeGetterSetter("darkMode"));
 const syncDeviceDarkMode = computed(
 	ColdDeviceStorage.makeGetterSetter("syncDeviceDarkMode"),
 );
+const rickRollDetect = computed(
+	ColdDeviceStorage.makeGetterSetter("rickRollDetect"),
+);
 const wallpaper = ref(localStorage.getItem("wallpaper"));
 const themesCount = installedThemes.value.length;
 
@@ -246,6 +254,12 @@ watch(syncDeviceDarkMode, () => {
 	}
 });
 
+watch(rickRollDetect, () => {
+	if (rickRollDetect.value) {
+		defaultStore.set("darkMode", isDeviceDarkmode());
+	}
+});
+
 watch(wallpaper, () => {
 	if (wallpaper.value == null) {
 		localStorage.removeItem("wallpaper");