diff --git a/addons/website_event/static/src/snippets/s_events/000.js b/addons/website_event/static/src/snippets/s_events/000.js
index 68fae94a2ab..bde61630864 100644
--- a/addons/website_event/static/src/snippets/s_events/000.js
+++ b/addons/website_event/static/src/snippets/s_events/000.js
@@ -12,12 +12,13 @@ const DynamicSnippetEvents = DynamicSnippet.extend({
      * @private
      */
     _getSearchDomain: function () {
-        const searchDomain = this._super.apply(this, arguments);
-        const filterByTagIds = JSON.parse(this.$el.get(0).dataset.filterByTagIds || '[]');
-        if (filterByTagIds.length > 0) {
-            searchDomain.concat(Array(filterByTagIds.length-1).fill('&'));
-            for (const tag of filterByTagIds) {
-                searchDomain.push(['tag_ids', 'in', tag]);
+        let searchDomain = this._super.apply(this, arguments);
+        const filterByTagIds = this.$el.get(0).dataset.filterByTagIds;
+        if (filterByTagIds) {
+            let tagGroupedByCategory = _.groupBy(JSON.parse(filterByTagIds), 'category_id');
+            for (const category in tagGroupedByCategory) {
+                searchDomain = searchDomain.concat(
+                    [['tag_ids', 'in', tagGroupedByCategory[category].map(e => e.id)]]);
             }
         }
         return searchDomain;
diff --git a/addons/website_event/static/src/snippets/s_events/options.js b/addons/website_event/static/src/snippets/s_events/options.js
index 9bbe76d5b7c..d5c9ada707c 100644
--- a/addons/website_event/static/src/snippets/s_events/options.js
+++ b/addons/website_event/static/src/snippets/s_events/options.js
@@ -10,39 +10,6 @@ const dynamicSnippetEventOptions = dynamicSnippetOptions.extend({
     init() {
         this._super.apply(this, arguments);
         this.modelNameFilter = 'event.event';
-        this.tagIDs = [];
-    },
-
-    async willStart() {
-        const _super = this._super.bind(this);
-        this.tagIDs = JSON.parse(this.$target[0].dataset.filterByTagIds || '[]');
-        const tags = await this._rpc({
-            model: 'event.tag',
-            method: 'search_read',
-            domain: ['&', ['category_id.website_published', '=', true], ['color', 'not in', ['0', false]]],
-            fields: ['id', 'display_name'],
-        });
-        this.allTagsByID = {};
-        for (const tag of tags) {
-            this.allTagsByID[tag.id] = tag;
-        }
-
-        return _super(...arguments);
-    },
-
-    setTags(previewMode, widgetValue, params) {
-        this.tagIDs = JSON.parse(widgetValue).map(tag => tag.id);
-        this.selectDataAttribute(previewMode, JSON.stringify(this.tagIDs), params);
-    },
-
-    /**
-     * @override
-     */
-    async _computeWidgetState(methodName, params) {
-        if (methodName === 'setTags') {
-            return JSON.stringify(this.tagIDs.map(id => this.allTagsByID[id]));
-        }
-        return this._super(...arguments);
     },
 
     _setOptionsDefaultValues() {
diff --git a/addons/website_event/views/snippets/s_events.xml b/addons/website_event/views/snippets/s_events.xml
index f81151a3e69..e883f41cec5 100644
--- a/addons/website_event/views/snippets/s_events.xml
+++ b/addons/website_event/views/snippets/s_events.xml
@@ -83,12 +83,13 @@
         <we-many2many t-if="snippet_name == 'event_upcoming_snippet'"
                       string="Event Tags"
                       data-name="event_tag_opt"
-                      data-model="event.event"
-                      data-m2o-field="tag_ids"
+                      data-model="event.tag"
+                      data-fakem2m="true"
                       data-domain='[["category_id.website_published", "=", true], ["color", "not in", ["0", false]]]'
                       data-limit="10"
-                      data-set-tags=""
                       data-attribute-name="filterByTagIds"
+                      data-fields="[&quot;category_id&quot;]"
+                      data-select-data-attribute=""
                       data-no-preview="true"/>
     </xpath>
 </template>