diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 4b39b6aa2..dcf0809ec 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -808,7 +808,9 @@ define([
                     h('span.cp-toolbar-name.cp-toolbar-drawer-element', Messages.toolbar_storeInDrive)
                 ])).click(common.prepareFeedback(type)).click(function () {
                     $(button).hide();
-                    common.getSframeChannel().query("Q_AUTOSTORE_STORE", null, function (err, obj) {
+                    common.getSframeChannel().query("Q_AUTOSTORE_STORE", {
+                        forceOwnDrive: true,
+                    }, function (err, obj) {
                         var error = err || (obj && obj.error);
                         if (error) {
                             $(button).show();
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index a0d584ea5..d32d06eac 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -974,6 +974,9 @@ define([
             data.forceSave = 1;
             //delete common.initialTeam;
         }
+        if (data.forceOwnDrive) {
+            data.teamId = -1;
+        }
         if (common.initialPath) {
             if (!data.path) {
                 data.path = Array.isArray(common.initialPath) ? common.initialPath
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 7351a2485..91d11c20d 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -1181,7 +1181,8 @@ define([
                     title: currentTitle,
                     channel: secret.channel,
                     path: initialPathInDrive, // Where to store the pad if we don't have it in our drive
-                    forceSave: true
+                    forceSave: true,
+                    forceOwnDrive: obj && obj.forceOwnDrive
                 };
                 setPadTitle(data, cb);
             });