diff --git a/core/model/schema/modx.mysql.schema.xml b/core/model/schema/modx.mysql.schema.xml
index 442c870267a..1d4a75635fb 100644
--- a/core/model/schema/modx.mysql.schema.xml
+++ b/core/model/schema/modx.mysql.schema.xml
@@ -1341,7 +1341,7 @@
         <field key="lastlogin" dbtype="int" precision="11" phptype="integer" null="false" default="0" />
         <field key="thislogin" dbtype="int" precision="11" phptype="integer" null="false" default="0" />
         <field key="failedlogincount" dbtype="int" precision="10" phptype="integer" null="false" default="0" />
-        <field key="sessionid" dbtype="varchar" precision="100" phptype="string" null="false" default="" />
+        <field key="sessionid" dbtype="varchar" precision="100" phptype="string" null="false" default="" /> <!-- deprecated - to be removed in 3.2 -->
         <field key="dob" dbtype="int" precision="10" phptype="integer" null="false" default="0" />
         <field key="gender" dbtype="tinyint" precision="1" phptype="integer" null="false" default="0" />
         <field key="address" dbtype="text" phptype="string" null="false" default="" />
diff --git a/core/src/Revolution/modUser.php b/core/src/Revolution/modUser.php
index f7c2b788469..574c90b351f 100644
--- a/core/src/Revolution/modUser.php
+++ b/core/src/Revolution/modUser.php
@@ -400,7 +400,6 @@ public function addSessionContext($context)
                     $ua->set('logincount', $ua->logincount + 1);
                     $ua->set('lastlogin', $ua->thislogin);
                     $ua->set('thislogin', time());
-                    $ua->set('sessionid', session_id());
                     $ua->save();
                 }
             }
diff --git a/core/src/Revolution/modUserProfile.php b/core/src/Revolution/modUserProfile.php
index 0c888b7ea24..6c6a5754317 100644
--- a/core/src/Revolution/modUserProfile.php
+++ b/core/src/Revolution/modUserProfile.php
@@ -19,7 +19,7 @@
  * @property int     $lastlogin        A UNIX timestamp showing the last time the User logged in
  * @property int     $thislogin        A UNIX timestamp showing the time this User currently logged in
  * @property int     $failedlogincount The number of failed logins this User has accumulated
- * @property int     $sessionid        The PHP sessionid of the User
+ * @property int     $sessionid        The PHP sessionid of the User (deprecated—to be removed in 3.2)
  * @property int     $dob              The date of birth of the User, in UNIX timestamp format
  * @property int     gender            The gender of the user; 1 for male, 2 for female, 0 for unknown
  * @property string  $address          The address of the User
diff --git a/setup/includes/upgrades/common/3.1.1-clear-sessionids.php b/setup/includes/upgrades/common/3.1.1-clear-sessionids.php
new file mode 100644
index 00000000000..1684f5bf471
--- /dev/null
+++ b/setup/includes/upgrades/common/3.1.1-clear-sessionids.php
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * Removes data from modUserProfile.sessionid field
+ *
+ * @var modX $modx
+ * @package setup
+ */
+
+$modx->updateCollection(\MODX\Revolution\modUserProfile::class, ['sessionid' => '']);
diff --git a/setup/includes/upgrades/mysql/3.1.1-pl.php b/setup/includes/upgrades/mysql/3.1.1-pl.php
new file mode 100644
index 00000000000..533f43cb4c2
--- /dev/null
+++ b/setup/includes/upgrades/mysql/3.1.1-pl.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Specific upgrades for Revolution 3.1.1-pl
+ *
+ * @var modX $modx
+ * @package setup
+ * @subpackage upgrades
+ */
+
+/* run upgrades common to all db platforms */
+include dirname(__DIR__) . '/common/3.1.1-clear-sessionids.php';