diff --git a/framework/core/src/Discussion/UserState.php b/framework/core/src/Discussion/UserState.php
index 4840b00b7..221663099 100644
--- a/framework/core/src/Discussion/UserState.php
+++ b/framework/core/src/Discussion/UserState.php
@@ -39,7 +39,7 @@ class UserState extends AbstractModel
     /**
      * {@inheritdoc}
      */
-    protected $table = 'discussions_users';
+    protected $table = 'discussion_user';
 
     /**
      * {@inheritdoc}
@@ -72,7 +72,7 @@ class UserState extends AbstractModel
      */
     public function discussion()
     {
-        return $this->belongsTo(Discussion::class, 'discussion_id');
+        return $this->belongsTo(Discussion::class);
     }
 
     /**
@@ -82,7 +82,7 @@ class UserState extends AbstractModel
      */
     public function user()
     {
-        return $this->belongsTo(User::class, 'user_id');
+        return $this->belongsTo(User::class);
     }
 
     /**