diff --git a/server/startup/migrations/v090.js b/server/startup/migrations/v090.js
new file mode 100644
index 00000000000..df469f86155
--- /dev/null
+++ b/server/startup/migrations/v090.js
@@ -0,0 +1,12 @@
+RocketChat.Migrations.add({
+	version: 90,
+	up() {
+		RocketChat.models.Settings.remove({ _id: 'Piwik', type: 'group' });
+
+		const settings = RocketChat.models.Settings.find({$or: [{_id: 'PiwikAnalytics_url', value: {$ne: null}}, {_id: 'PiwikAnalytics_siteId', value: {$ne: null}}]}).fetch();
+
+		if (settings && settings.length === 2) {
+			RocketChat.models.Settings.upsert({_id: 'PiwikAnalytics_enabled'}, {$set: {value: true}});
+		}
+	}
+});