diff --git a/app/views/course/contentmodules/index.php b/app/views/course/contentmodules/index.php
index af8f3e1ebafee90aec2ff8ae76bdb1dc0b85ce05..443911a7c407193504dcd14e68e9d80ef544afc6 100644
--- a/app/views/course/contentmodules/index.php
+++ b/app/views/course/contentmodules/index.php
@@ -1 +1,4 @@
-<div class="content-modules-vue-app" is="ContentModules"></div>
+<div class="content-modules-vue-app"
+     is="ContentModules"
+     range-type="<?= get_class($sem) ?>"
+></div>
diff --git a/resources/vue/components/ContentModules.vue b/resources/vue/components/ContentModules.vue
index a48dd9d69092ca4863e1158ea82ffd8c3f7e665b..e6164900787e0032362be1665e393a343989b9f0 100644
--- a/resources/vue/components/ContentModules.vue
+++ b/resources/vue/components/ContentModules.vue
@@ -36,6 +36,7 @@
         <component :is="displayComponent"
                    :modules="modules"
                    :filtercategory="filterCategory"
+                   :range-type="rangeType"
         ></component>
 
         <MountingPortal mount-to="#tool-view-switch .sidebar-widget-content .widget-list" name="sidebar-switch">
diff --git a/resources/vue/components/ContentModulesEditTiles.vue b/resources/vue/components/ContentModulesEditTiles.vue
index 7407632c40aea3784a2aeb4615ad224ee7544314..ae9324c4e7a1985768625e3373d937b4f1c433f3 100644
--- a/resources/vue/components/ContentModulesEditTiles.vue
+++ b/resources/vue/components/ContentModulesEditTiles.vue
@@ -61,7 +61,7 @@
                                     href="#"
                                     class="toggle_visibility"
                                     role="checkbox"
-                                    v-if="!module.mandatory"
+                                    v-if="showVisibilityToggle(module)"
                                     :aria-checked="module.visibility !== 'tutor' ? 'true' : 'false'"
                                     @click.prevent="toggleModuleVisibility(module)"
                                 >
diff --git a/resources/vue/components/ContentmodulesEditTable.vue b/resources/vue/components/ContentmodulesEditTable.vue
index 0a8a0aa6f384446cc5cdd86177fbef4e96f682d3..39835a7007eb71e83b1dc4880d77a51fda5c4d58 100644
--- a/resources/vue/components/ContentmodulesEditTable.vue
+++ b/resources/vue/components/ContentmodulesEditTable.vue
@@ -59,7 +59,7 @@
                 <td class="actions">
                     <a
                         href="#"
-                        v-if="module.active && !module.mandatory"
+                        v-if="showVisibilityToggle(module)"
                         role="checkbox"
                         :aria-checked="module.visibility !== 'tutor' ? 'true' : 'false'"
                         @click.prevent="toggleModuleVisibility(module)"
@@ -121,7 +121,6 @@ import ContentModulesMixin from '../mixins/ContentModulesMixin.js';
 
 export default {
     name: 'contentmodules-edit-table',
-
     mixins: [ContentModulesMixin],
 };
 </script>
diff --git a/resources/vue/mixins/ContentModulesMixin.js b/resources/vue/mixins/ContentModulesMixin.js
index 86a29ffb52af4c3c9badb087382d1eb6435f6f73..b02561d9ee1060e19208c910f19ee247d7629add 100644
--- a/resources/vue/mixins/ContentModulesMixin.js
+++ b/resources/vue/mixins/ContentModulesMixin.js
@@ -5,6 +5,9 @@ export default {
     components: {
         draggable,
     },
+    props: {
+        rangeType: String,
+    },
     data: () => ({
         order: [],
     }),
@@ -132,5 +135,10 @@ export default {
 
             return classes.join(' ');
         },
+        showVisibilityToggle(module) {
+            return this.rangeType !== 'Institute'
+                && module.active
+                && !module.mandatory;
+        }
     },
 };