diff --git a/core/js/dist/login.js b/core/js/dist/login.js
index eb2dfb3afdb7868c1fbd9d050886f2f60335ff8e..f8b3651d3883dfc0049c14f947965b680833e6a9 100644
Binary files a/core/js/dist/login.js and b/core/js/dist/login.js differ
diff --git a/core/js/dist/login.js.map b/core/js/dist/login.js.map
index 18a467386bc66c2c9308cf654a948252377fb555..af0c325e9a8c288713043458e5984765e51713ac 100644
Binary files a/core/js/dist/login.js.map and b/core/js/dist/login.js.map differ
diff --git a/core/js/dist/main.js b/core/js/dist/main.js
index 32db011b4a58ae18dd8ccfc91ecc89c27a0c7565..68c38f81cea60b014ed0f4689e330e63b4c98b00 100644
Binary files a/core/js/dist/main.js and b/core/js/dist/main.js differ
diff --git a/core/js/dist/main.js.map b/core/js/dist/main.js.map
index 107ea57d8a28988c940e137a5f92a4bce6b4eaf8..d72e37e2ed76bc8910b6205711eb5b1e03638d8f 100644
Binary files a/core/js/dist/main.js.map and b/core/js/dist/main.js.map differ
diff --git a/core/js/dist/unified-search.js b/core/js/dist/unified-search.js
index 12c5658d2894f3ad546f9a1e71bba24e8c6338ba..37e776d8dbd251abf7cf8a74ff5696455386d5b3 100644
Binary files a/core/js/dist/unified-search.js and b/core/js/dist/unified-search.js differ
diff --git a/core/js/dist/unified-search.js.map b/core/js/dist/unified-search.js.map
index 45225c6a1bc518b14a3f51eb610d443eaedffe06..c5162ab3d7258a6bcc6beb1b097ce6ec5d61b73d 100644
Binary files a/core/js/dist/unified-search.js.map and b/core/js/dist/unified-search.js.map differ
diff --git a/core/src/OCA/index.js b/core/src/OCA/index.js
index 4b87d325a55ca45a6d4a9501432411ffd591ea26..8cf5e6efeb4827d7016da0253896e529764ac186 100644
--- a/core/src/OCA/index.js
+++ b/core/src/OCA/index.js
@@ -19,8 +19,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import Search from './search'
+
 /**
  * Namespace for apps
  * @namespace OCA
  */
-export default {}
+export default {
+	/**
+	 * @deprecated 20.0.0, will be removed in Nextcloud 22
+	 */
+	Search,
+}
diff --git a/core/src/OCA/search.js b/core/src/OCA/search.js
new file mode 100644
index 0000000000000000000000000000000000000000..f3eba1247f9e783a68239f86aa4f4763f1eadb94
--- /dev/null
+++ b/core/src/OCA/search.js
@@ -0,0 +1,34 @@
+/*
+ * @copyright 2020 Christoph Wurst <christoph@winzerhof-wurst.at>
+ *
+ * @author 2020 Christoph Wurst <christoph@winzerhof-wurst.at>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @deprecated 20.0.0, will be removed in Nextcloud 22
+ */
+export default class Search {
+
+	/**
+	 * @deprecated 20.0.0, will be removed in Nextcloud 22
+	 */
+	constructor() {
+		console.warn('OCA.Search is deprecated. Please use the unified search API instead')
+	}
+
+}
diff --git a/core/src/unified-search.js b/core/src/unified-search.js
index c6d835836bbe66815bde3fff45c3b2a51f26bc3a..ba975d78564b6922539d82f6a0952af64f76c832 100644
--- a/core/src/unified-search.js
+++ b/core/src/unified-search.js
@@ -32,18 +32,6 @@ __webpack_nonce__ = btoa(getRequestToken())
 // eslint-disable-next-line camelcase
 __webpack_public_path__ = generateFilePath('core', '', 'js/')
 
-// TODO: remove with nc22
-if (!OCA.Search) {
-	class Search {
-
-		constructor() {
-			console.warn('OCA.Search is deprecated. Please use the unified search API instead')
-		}
-
-	}
-	OCA.Search = Search
-}
-
 Vue.mixin({
 	methods: {
 		t,