diff --git a/spec/ParseUser.spec.js b/spec/ParseUser.spec.js
index 8c67d92151..b2bdfd02c4 100644
--- a/spec/ParseUser.spec.js
+++ b/spec/ParseUser.spec.js
@@ -1564,6 +1564,26 @@ describe('Parse.User testing', () => {
     expect(u2.getSessionToken()).toBe(model.getSessionToken());
   });
 
+  it('link with provider via sessionToken should not create new sessionToken (Regression #5799)', async () => {
+    const provider = getMockFacebookProvider();
+    Parse.User._registerAuthenticationProvider(provider);
+    const user = new Parse.User();
+    user.set('username', 'testLinkWithProviderNoOverride');
+    user.set('password', 'mypass');
+    await user.signUp();
+    const sessionToken = user.getSessionToken();
+
+    await user._linkWith('facebook', {}, { sessionToken });
+    expect(sessionToken).toBe(user.getSessionToken());
+
+    expect(user._isLinked(provider)).toBe(true);
+    await user._unlinkFrom(provider, { sessionToken });
+    expect(user._isLinked(provider)).toBe(false);
+
+    const become = await Parse.User.become(sessionToken);
+    expect(sessionToken).toBe(become.getSessionToken());
+  });
+
   it('link with provider failed', async done => {
     const provider = getMockFacebookProvider();
     provider.shouldError = true;
diff --git a/src/RestWrite.js b/src/RestWrite.js
index f684ca113c..3fea6043de 100644
--- a/src/RestWrite.js
+++ b/src/RestWrite.js
@@ -806,6 +806,10 @@ RestWrite.prototype.createSessionTokenIfNeeded = function() {
   if (this.query && !this.data.authData) {
     return;
   }
+  // Don't generate new sessionToken if linking via sessionToken
+  if (this.auth.user && this.data.authData) {
+    return;
+  }
   if (
     !this.storage['authProvider'] && // signup call, with
     this.config.preventLoginWithUnverifiedEmail && // no login without verification