diff --git a/app/Models/Preference.php b/app/Models/Preference.php
index 33d7e22c33..44e5951cbf 100644
--- a/app/Models/Preference.php
+++ b/app/Models/Preference.php
@@ -24,7 +24,6 @@ use Illuminate\Database\Eloquent\Model;
  * @property string                $name
  * @property string                $name_encrypted
  * @property string                $data
- * @property string                $data_encrypted
  * @property-read \FireflyIII\User $user
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereId($value)
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereCreatedAt($value)
@@ -41,7 +40,6 @@ class Preference extends Model
 
     protected $dates    = ['created_at', 'updated_at'];
     protected $fillable = ['user_id', 'data', 'name'];
-    protected $hidden   = ['data_encrypted', 'name_encrypted'];
 
     /**
      * @param $value
@@ -50,10 +48,7 @@ class Preference extends Model
      */
     public function getDataAttribute($value)
     {
-        if (is_null($this->data_encrypted)) {
-            return json_decode($value);
-        }
-        $data = Crypt::decrypt($this->data_encrypted);
+        $data = Crypt::decrypt($value);
 
         return json_decode($data);
     }
@@ -63,8 +58,7 @@ class Preference extends Model
      */
     public function setDataAttribute($value)
     {
-        $this->attributes['data']           = '';
-        $this->attributes['data_encrypted'] = Crypt::encrypt(json_encode($value));
+        $this->attributes['data'] = Crypt::encrypt(json_encode($value));
     }
 
     /**
diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php
index 717c7d364b..96d935bc85 100644
--- a/app/Support/Preferences.php
+++ b/app/Support/Preferences.php
@@ -69,7 +69,7 @@ class Preferences
             return Cache::get($fullName);
         }
 
-        $preference = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data_encrypted']);
+        $preference = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data']);
 
         if ($preference) {
             Cache::forever($fullName, $preference);
@@ -138,7 +138,7 @@ class Preferences
     {
         $fullName = 'preference' . $user->id . $name;
         Cache::forget($fullName);
-        $pref = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data_encrypted']);
+        $pref = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data']);
 
         if (!is_null($pref)) {
             $pref->data = $value;