diff --git a/packages/nc-gui/components/project/settings/appearance.vue b/packages/nc-gui/components/project/settings/appearance.vue
index f6f5ffe5d2..76f07a346e 100644
--- a/packages/nc-gui/components/project/settings/appearance.vue
+++ b/packages/nc-gui/components/project/settings/appearance.vue
@@ -42,7 +42,7 @@
             </v-tooltip>
           </td>
         </tr>-->
-          <tr>
+          <!--          <tr>
             <td>Show Screensaver</td>
             <td>
               <v-tooltip bottom>
@@ -59,7 +59,7 @@
                 Show/hide metatables
               </v-tooltip>
             </td>
-          </tr>
+          </tr>-->
           <tr>
             <td>Show M2M Tables</td>
             <td>
diff --git a/packages/nc-gui/components/projectTabs.vue b/packages/nc-gui/components/projectTabs.vue
index ad72449174..6d07c23c28 100644
--- a/packages/nc-gui/components/projectTabs.vue
+++ b/packages/nc-gui/components/projectTabs.vue
@@ -285,7 +285,7 @@
       @create="$emit('tableCreate',$event); dialogCreateTableShow =false;"
     />
 
-    <screensaver v-if="showScreensaver && !($store.state.project.projectInfo && $store.state.project.projectInfo.ncMin)" class="screensaver" />
+    <!--    <screensaver v-if="showScreensaver && !($store.state.project.projectInfo && $store.state.project.projectInfo.ncMin)" class="screensaver" />-->
   </v-container>
 </template>
 
@@ -313,7 +313,7 @@ import ApiClientSwaggerTab from './project/apiClientSwagger'
 import XcMeta from './project/settings/xcMeta'
 import XcInfo from './project/xcInfo'
 import SwaggerClient from '@/components/project/swaggerClient'
-import Screensaver from '@/components/screensaver'
+// import Screensaver from '@/components/screensaver'
 import DlgTableCreate from '@/components/utils/dlgTableCreate'
 import AppStore from '@/components/project/appStore'
 import AuthTab from '@/components/authTab'
@@ -327,7 +327,7 @@ import AuditTab from '~/components/project/auditTab'
 export default {
   components: {
     SwaggerClient,
-    Screensaver,
+    // Screensaver,
     DlgTableCreate,
     AuditTab,
     AppStore,
@@ -511,7 +511,7 @@ export default {
     //   // }
     // );
 
-    this.checkInactiveState()
+    // this.checkInactiveState()
   },
   mounted() {
   },
diff --git a/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts b/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
index 0e112ee897..94256227e3 100644
--- a/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
+++ b/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
@@ -371,7 +371,7 @@ export default class NcMetaMgr {
           break;
 
         default:
-          next();
+          return next();
           break;
       }
     } catch (e) {