diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 628a742ec..318b75919 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -280,7 +280,7 @@ class SettingsController extends Controller
 		$uid = $request->user()->id;
 
 		$setting = UserSetting::whereUserId($uid)->firstOrFail();
-		$compose = json_decode($setting->compose_settings, true);
+		$compose = is_string($setting->compose_settings) ? json_decode($setting->compose_settings, true) : $setting->compose_settings;
 		$changed = false;
 
 		if($sync) {