diff --git a/packages/rocketchat-file-upload/server/config/GridFS.js b/packages/rocketchat-file-upload/server/config/GridFS.js
index 9e381b403e2..99496bdae3f 100644
--- a/packages/rocketchat-file-upload/server/config/GridFS.js
+++ b/packages/rocketchat-file-upload/server/config/GridFS.js
@@ -73,7 +73,6 @@ const readFromGridFS = function(storeName, fileId, file, headers, req, res) {
 	const ws = new stream.PassThrough();
 
 	[rs, ws].forEach(stream => stream.on('error', function(err) {
-		console.log('error');
 		store.onReadError.call(store, err, fileId, file);
 		res.end();
 	}));
diff --git a/packages/rocketchat-file-upload/server/lib/FileUpload.js b/packages/rocketchat-file-upload/server/lib/FileUpload.js
index 5676738d8ae..e0c9b076a54 100644
--- a/packages/rocketchat-file-upload/server/lib/FileUpload.js
+++ b/packages/rocketchat-file-upload/server/lib/FileUpload.js
@@ -185,11 +185,9 @@ Object.assign(FileUpload, {
 
 	get(file, req, res, next) {
 		const store = this.getStoreByName(file.store);
-		// if (file.store && this.handlers && this.handlers[file.store] && this.handlers[file.store].get) {
-		if (store && store.get) {
+		if (store) {
 			return store.get(file, req, res, next);
 		}
-		// }
 		res.writeHead(404);
 		res.end();
 	}