diff --git a/lib/models/BlubberThread.php b/lib/models/BlubberThread.php
index d3a4de660a9c48f54e92f85d2a271dd34d0ac5c5..57b72f05e4ca1078de43415434b7a97cb04b0404 100644
--- a/lib/models/BlubberThread.php
+++ b/lib/models/BlubberThread.php
@@ -478,7 +478,12 @@ class BlubberThread extends SimpleORMap implements PrivacyObject
                 if ($module = $tool->getStudipModule()) {
                     $last_visit = object_get_visit($this['context_id'], $module->getPluginId());
                     $nav = $module->getIconNavigation($this['context_id'], $last_visit, $GLOBALS['user']->id);
-                    if (isset($nav) && $nav->isVisible(true)) {
+                    if (
+                        isset($nav)
+                        && $nav->isVisible(true)
+                        && count($module->getTabNavigation($this['context_id'])) > 0
+                        && $GLOBALS['perm']->have_studip_perm($tool->getVisibilityPermission(), $this['context_id'])
+                    ) {
                         $icons[] = $nav;
                     }
                     if ($module instanceof CoreSchedule) {