diff --git a/.meteor/versions b/.meteor/versions
index cadf5a17438..da42836cd55 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -101,7 +101,7 @@ oauth1@1.1.11
 oauth2@1.1.11
 observe-sequence@1.0.15
 ordered-dict@1.0.9
-ostrio:cookies@2.1.3
+ostrio:cookies@2.2.0
 pauli:accounts-linkedin@1.3.1
 pauli:linkedin@1.3.1
 peerlibrary:aws-sdk@2.4.9_1
diff --git a/lib/fileUpload.js b/lib/fileUpload.js
index 4475b171f42..915c617346e 100644
--- a/lib/fileUpload.js
+++ b/lib/fileUpload.js
@@ -1,8 +1,8 @@
-/* globals UploadFS, Cookies, FileUpload */
+/* globals UploadFS, FileUpload */
+import { Cookies } from 'meteor/ostrio:cookies';
 
 if (UploadFS) {
 	const initFileStore = function() {
-		import { Cookies } from 'meteor/ostrio:cookies';
 		const cookie = new Cookies();
 		if (Meteor.isClient) {
 			document.cookie = 'rc_uid=' + escape(Meteor.userId()) + '; path=/';
diff --git a/packages/rocketchat-file-upload/package.js b/packages/rocketchat-file-upload/package.js
index 2c3f34d83a1..8ba5db02407 100644
--- a/packages/rocketchat-file-upload/package.js
+++ b/packages/rocketchat-file-upload/package.js
@@ -13,6 +13,7 @@ Package.onUse(function(api) {
 	api.use('jalik:ufs');
 	api.use('jalik:ufs-local@0.2.5');
 	api.use('edgee:slingshot');
+	api.use('ostrio:cookies');
 	api.use('peerlibrary:aws-sdk');
 	api.use('rocketchat:lib');
 	api.use('random');
diff --git a/packages/rocketchat-file-upload/server/lib/requests.js b/packages/rocketchat-file-upload/server/lib/requests.js
index 1669b0b733a..21138208ff6 100644
--- a/packages/rocketchat-file-upload/server/lib/requests.js
+++ b/packages/rocketchat-file-upload/server/lib/requests.js
@@ -1,4 +1,6 @@
-/* globals FileUpload, WebApp, Cookies */
+/* globals FileUpload, WebApp */
+import { Cookies } from 'meteor/ostrio:cookies';
+
 let protectedFiles;
 
 RocketChat.settings.get('FileUpload_ProtectFiles', function(key, value) {
@@ -14,7 +16,6 @@ WebApp.connectHandlers.use('/file-upload/', function(req, res, next) {
 		if (file) {
 			if (!Meteor.settings.public.sandstorm && protectedFiles) {
 				let rawCookies, ref, token, uid;
-				import { Cookies } from 'meteor/ostrio:cookies';
 				const cookie = new Cookies();
 
 				if ((typeof req !== 'undefined' && req !== null ? (ref = req.headers) != null ? ref.cookie : void 0 : void 0) != null) {