diff --git a/layouts/default.vue b/layouts/default.vue
index b7cf871a..79393643 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -13,7 +13,7 @@
       #links
         a(href='https://gancio.org') Gancio {{settings.version}}</a>
         span  ⇒
-        a(rel='me' :href='settings.baseurl' @click.prevent='showFollowMe=true') follow me
+        a(v-if='settings.enable_federation' rel='me' :href='settings.baseurl' @click.prevent='showFollowMe=true') follow me
         nuxt-link(to='/about') about
         a(href='https://blog.gancio.org') blog
         a(href='https://framagit.org/les/gancio') source
diff --git a/pages/export.vue b/pages/export.vue
index 724d866d..50bb1bee 100644
--- a/pages/export.vue
+++ b/pages/export.vue
@@ -21,7 +21,7 @@
           v-clipboard:copy='link' v-clipboard:success='copyLink'
           type="primary" icon='el-icon-document' ) {{$t("common.copy")}}
 
-      el-tab-pane.pt-1(:label="$t('common.fediverse')" name='fediverse')
+      el-tab-pane.pt-1(v-if='settings.enable_federation' :label="$t('common.fediverse')" name='fediverse')
         FollowMe
 
       el-tab-pane.pt-1(label='ics/ical' name='ics')
diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index 747014ca..b683b08f 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -175,6 +175,7 @@ const eventController = {
   async getUnconfirmed (req, res) {
     const events = await Event.findAll({
       where: {
+        parentId: null,
         is_visible: false
       },
       order: [['start_datetime', 'ASC']],