diff --git a/server/src/PermissionCalculator.cpp b/server/src/PermissionCalculator.cpp
index 339c543..30fc173 100644
--- a/server/src/PermissionCalculator.cpp
+++ b/server/src/PermissionCalculator.cpp
@@ -361,6 +361,10 @@ const std::shared_ptr<groups::ChannelGroup>& ClientPermissionCalculator::assigne
 }
 
 bool ClientPermissionCalculator::has_global_skip_permission() {
+    if(this->skip_enabled.has_value()) {
+        return *this->skip_enabled;
+    }
+
     /* test for skip permission within the client permission manager */
     {
         auto client_permissions = this->client_permissions();