diff --git a/install/package.json b/install/package.json
index eae0536028..f1e925a203 100644
--- a/install/package.json
+++ b/install/package.json
@@ -61,8 +61,8 @@
       "nconf": "^0.8.5",
       "nodebb-plugin-composer-default": "6.0.6",
       "nodebb-plugin-dbsearch": "2.0.9",
-      "nodebb-plugin-emoji-extended": "1.1.1",
-      "nodebb-plugin-emoji-one": "1.2.1",
+      "nodebb-plugin-emoji": "2.0.1",
+      "nodebb-plugin-emoji-android": "2.0.0",
       "nodebb-plugin-markdown": "8.2.0",
       "nodebb-plugin-mentions": "2.2.2",
       "nodebb-plugin-soundpack-default": "1.0.0",
diff --git a/src/install.js b/src/install.js
index 2a3fa7d9db..89b3d3fa49 100644
--- a/src/install.js
+++ b/src/install.js
@@ -439,8 +439,8 @@ function enableDefaultPlugins(next) {
 		'nodebb-widget-essentials',
 		'nodebb-rewards-essentials',
 		'nodebb-plugin-soundpack-default',
-		'nodebb-plugin-emoji-extended',
-		'nodebb-plugin-emoji-one',
+		'nodebb-plugin-emoji',
+		'nodebb-plugin-emoji-android',
 	];
 	var customDefaults = nconf.get('defaultplugins') || nconf.get('defaultPlugins');