diff --git a/electron-builder.json b/electron-builder.json
index e267ab26fa..dc87c24635 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -29,7 +29,7 @@
     "type": "distribution",
     "hardenedRuntime": true,
     "darkModeSupport": true,
-    "bundleVersion": "60",
+    "bundleVersion": "70",
     "icon": "resources/icon.icns",
     "artifactName": "${productName}-${os}-${arch}.${ext}",
     "entitlements": "resources/entitlements.mac.plist",
diff --git a/redisinsight/ui/src/assets/img/triggers_and_functions_dark.svg b/redisinsight/ui/src/assets/img/triggers_and_functions_dark.svg
index 198f36f814..01419faea7 100644
--- a/redisinsight/ui/src/assets/img/triggers_and_functions_dark.svg
+++ b/redisinsight/ui/src/assets/img/triggers_and_functions_dark.svg
@@ -1,4 +1,4 @@
-<svg width="665" height="564" viewBox="0 0 665 564" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 665 564" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M98.4787 348.166L98.536 342.46M98.4035 337.408L98.3587 332.742M98.332 327.977L98.2404 322.509M97.9937 318.198L97.8817 312.938M97.7885 308.596L97.4984 303.445M97.2327 298.642L97.0799 293.798M96.8659 289.578L96.348 284.617M95.805 280.082C95.7755 278.959 95.6506 276.363 95.3863 274.961M94.9739 271.059L93.936 265M98.4787 359.016L98.536 353.31M98.4787 370.222L98.536 364.516M98.4787 383.516L98.536 377.81M98.4787 395.516L98.536 389.81M98.4787 406.016L98.536 400.31M98.4787 416.016L98.536 410.31M98.4787 428.016L98.536 422.31M98.4787 439.016L98.536 433.31M98.4787 450.222L98.536 444.516M98.4787 462.222L98.536 456.516M98.4787 473.222L98.536 467.516M98.4787 484.222L98.536 478.516M98.4787 497.222L98.536 491.516M98.4787 509.222L98.536 503.516M98.4787 520.516L98.536 514.81M98.4787 532.516L98.536 526.81M98.4787 543.722L98.536 538.016M98.4787 554.722L98.536 549.016" stroke="white" stroke-miterlimit="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M328.479 348.166L328.536 342.46M328.403 337.408L328.359 332.742M328.332 327.977L328.24 322.509M327.994 318.198L327.882 312.938M327.789 308.596L327.498 303.445M327.233 298.642L327.08 293.798M326.866 289.578L326.348 284.617M325.805 280.082C325.776 278.959 325.651 276.363 325.386 274.961M324.974 271.059L323.936 265M328.479 359.016L328.536 353.31M328.479 370.222L328.536 364.516M328.479 383.516L328.536 377.81M328.479 395.516L328.536 389.81M328.479 406.016L328.536 400.31M328.479 416.016L328.536 410.31M328.479 428.016L328.536 422.31M328.479 439.016L328.536 433.31M328.479 450.222L328.536 444.516M328.479 462.222L328.536 456.516M328.479 473.222L328.536 467.516M328.479 484.222L328.536 478.516M328.479 497.222L328.536 491.516M328.479 509.222L328.536 503.516M328.479 520.516L328.536 514.81M328.479 532.516L328.536 526.81M328.479 543.722L328.536 538.016M328.479 554.722L328.536 549.016" stroke="white" stroke-miterlimit="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M549.479 348.166L549.536 342.46M549.403 337.408L549.359 332.742M549.332 327.977L549.24 322.509M548.994 318.198L548.882 312.938M548.789 308.596L548.498 303.445M548.233 298.642L548.08 293.798M547.866 289.578L547.348 284.617M546.805 280.082C546.776 278.959 546.651 276.363 546.386 274.961M545.974 271.059L544.936 265M549.479 359.016L549.536 353.31M549.479 370.222L549.536 364.516M549.479 383.516L549.536 377.81M549.479 395.516L549.536 389.81M549.479 406.016L549.536 400.31M549.479 416.016L549.536 410.31M549.479 428.016L549.536 422.31M549.479 439.016L549.536 433.31M549.479 450.222L549.536 444.516M549.479 462.222L549.536 456.516M549.479 473.222L549.536 467.516M549.479 484.222L549.536 478.516M549.479 497.222L549.536 491.516M549.479 509.222L549.536 503.516M549.479 520.516L549.536 514.81M549.479 532.516L549.536 526.81M549.479 543.722L549.536 538.016M549.479 554.722L549.536 549.016" stroke="white" stroke-miterlimit="1.5" stroke-linecap="round" stroke-linejoin="round"/>
diff --git a/redisinsight/ui/src/assets/img/triggers_and_functions_light.svg b/redisinsight/ui/src/assets/img/triggers_and_functions_light.svg
index 5ae9fe1e06..7a26127835 100644
--- a/redisinsight/ui/src/assets/img/triggers_and_functions_light.svg
+++ b/redisinsight/ui/src/assets/img/triggers_and_functions_light.svg
@@ -1,4 +1,4 @@
-<svg width="665" height="564" viewBox="0 0 665 564" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 665 564" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_862_7885)">
 <path d="M98.4787 355.166L98.536 349.46M98.4035 344.408L98.3587 339.742M98.332 334.977L98.2404 329.509M97.9937 325.198L97.8817 319.938M97.7885 315.596L97.4984 310.445M97.2327 305.642L97.0799 300.798M96.8659 296.578L96.348 291.617M95.805 287.082C95.7755 285.959 95.6506 283.363 95.3863 281.961M94.9739 278.059L93.936 272M98.4787 366.016L98.536 360.31M98.4787 377.222L98.536 371.516M98.4787 390.516L98.536 384.81M98.4787 402.516L98.536 396.81M98.4787 413.016L98.536 407.31M98.4787 423.016L98.536 417.31M98.4787 435.016L98.536 429.31M98.4787 446.016L98.536 440.31M98.4787 457.222L98.536 451.516M98.4787 469.222L98.536 463.516M98.4787 480.222L98.536 474.516M98.4787 491.222L98.536 485.516M98.4787 504.222L98.536 498.516M98.4787 516.222L98.536 510.516M98.4787 527.516L98.536 521.81M98.4787 539.516L98.536 533.81M98.4787 550.722L98.536 545.016M98.4787 561.722L98.536 556.016" stroke="#173369" stroke-miterlimit="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M328.479 355.166L328.536 349.46M328.403 344.408L328.359 339.742M328.332 334.977L328.24 329.509M327.994 325.198L327.882 319.938M327.789 315.596L327.498 310.445M327.233 305.642L327.08 300.798M326.866 296.578L326.348 291.617M325.805 287.082C325.776 285.959 325.651 283.363 325.386 281.961M324.974 278.059L323.936 272M328.479 366.016L328.536 360.31M328.479 377.222L328.536 371.516M328.479 390.516L328.536 384.81M328.479 402.516L328.536 396.81M328.479 413.016L328.536 407.31M328.479 423.016L328.536 417.31M328.479 435.016L328.536 429.31M328.479 446.016L328.536 440.31M328.479 457.222L328.536 451.516M328.479 469.222L328.536 463.516M328.479 480.222L328.536 474.516M328.479 491.222L328.536 485.516M328.479 504.222L328.536 498.516M328.479 516.222L328.536 510.516M328.479 527.516L328.536 521.81M328.479 539.516L328.536 533.81M328.479 550.722L328.536 545.016M328.479 561.722L328.536 556.016" stroke="#173369" stroke-miterlimit="1.5" stroke-linecap="round" stroke-linejoin="round"/>
diff --git a/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.spec.tsx b/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.spec.tsx
index 873e3b70b0..e86a7950c1 100644
--- a/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.spec.tsx
+++ b/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.spec.tsx
@@ -161,4 +161,14 @@ describe('FunctionsPage', () => {
     expect(pushMock)
       .toBeCalledWith(Pages.triggeredFunctionsLibraries('instanceId'))
   })
+
+  it('should not render functions list', () => {
+    (triggeredFunctionsFunctionsSelector as jest.Mock).mockReturnValueOnce({
+      data: null,
+      loading: false
+    })
+    const { queryByTestId } = render(<FunctionsPage />)
+
+    expect(queryByTestId('total-functions')).not.toBeInTheDocument()
+  })
 })
diff --git a/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.tsx b/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.tsx
index 54bbd7c002..682b72908a 100644
--- a/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.tsx
+++ b/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.tsx
@@ -3,7 +3,7 @@ import { EuiFieldSearch, EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiResiza
 import { useDispatch, useSelector } from 'react-redux'
 import { useHistory } from 'react-router-dom'
 import cx from 'classnames'
-import { find, pick } from 'lodash'
+import { find, isNull, pick } from 'lodash'
 import {
   fetchTriggeredFunctionsFunctionsList,
   setSelectedFunctionToShow,
@@ -114,6 +114,10 @@ const FunctionsPage = () => {
     ? NoFunctionsMessage
     : (<NoLibrariesScreen isModuleLoaded={isModuleLoaded} onAddLibrary={onAddLibrary} />)
 
+  if (!instanceId) {
+    return null
+  }
+
   return (
     <EuiFlexGroup
       className={cx('triggeredFunctions__page', styles.main)}
@@ -164,16 +168,18 @@ const FunctionsPage = () => {
                       <EuiLoadingSpinner size="xl" />
                     </div>
                   )}
-                  <FunctionsList
-                    items={items}
-                    loading={loading}
-                    onRefresh={updateList}
-                    lastRefresh={lastRefresh}
-                    selectedRow={selectedRow}
-                    onSelectRow={handleSelectRow}
-                    message={message}
-                    isRefreshDisabled={!isModuleLoaded}
-                  />
+                  {(!isModuleLoaded || !isNull(functions)) && (
+                    <FunctionsList
+                      items={items}
+                      loading={loading}
+                      onRefresh={updateList}
+                      lastRefresh={lastRefresh}
+                      selectedRow={selectedRow}
+                      onSelectRow={handleSelectRow}
+                      message={message}
+                      isRefreshDisabled={!isModuleLoaded}
+                    />
+                  )}
                 </div>
               </EuiResizablePanel>
               <EuiResizableButton
diff --git a/redisinsight/ui/src/pages/triggeredFunctions/pages/Libraries/LibrariesPage.spec.tsx b/redisinsight/ui/src/pages/triggeredFunctions/pages/Libraries/LibrariesPage.spec.tsx
index 15d81a72c5..39b93672dd 100644
--- a/redisinsight/ui/src/pages/triggeredFunctions/pages/Libraries/LibrariesPage.spec.tsx
+++ b/redisinsight/ui/src/pages/triggeredFunctions/pages/Libraries/LibrariesPage.spec.tsx
@@ -229,4 +229,14 @@ describe('LibrariesPage', () => {
 
     expect(screen.queryByTestId('lib-details-lib1')).not.toBeInTheDocument()
   })
+
+  it('should not render libraries list', () => {
+    (triggeredFunctionsLibrariesSelector as jest.Mock).mockReturnValueOnce({
+      data: null,
+      loading: false
+    })
+    const { queryByTestId } = render(<LibrariesPage />)
+
+    expect(queryByTestId('total-libraries')).not.toBeInTheDocument()
+  })
 })
diff --git a/redisinsight/ui/src/pages/triggeredFunctions/pages/Libraries/LibrariesPage.tsx b/redisinsight/ui/src/pages/triggeredFunctions/pages/Libraries/LibrariesPage.tsx
index 5a53914b91..5ad76a14a5 100644
--- a/redisinsight/ui/src/pages/triggeredFunctions/pages/Libraries/LibrariesPage.tsx
+++ b/redisinsight/ui/src/pages/triggeredFunctions/pages/Libraries/LibrariesPage.tsx
@@ -240,17 +240,19 @@ const LibrariesPage = () => {
                       <EuiLoadingSpinner size="xl" />
                     </div>
                   )}
-                  <LibrariesList
-                    items={items}
-                    loading={loading}
-                    onRefresh={updateList}
-                    lastRefresh={lastRefresh}
-                    selectedRow={selectedRow}
-                    onSelectRow={handleSelectRow}
-                    onDeleteRow={handleDelete}
-                    message={message}
-                    isRefreshDisabled={!isModuleLoaded}
-                  />
+                  {(!isModuleLoaded || !isNull(libraries)) && (
+                    <LibrariesList
+                      items={items}
+                      loading={loading}
+                      onRefresh={updateList}
+                      lastRefresh={lastRefresh}
+                      selectedRow={selectedRow}
+                      onSelectRow={handleSelectRow}
+                      onDeleteRow={handleDelete}
+                      message={message}
+                      isRefreshDisabled={!isModuleLoaded}
+                    />
+                  )}
                 </div>
               </EuiResizablePanel>
               <EuiResizableButton