diff --git a/src/components/tools/block.ts b/src/components/tools/block.ts
index 8ede034b..ed54ff26 100644
--- a/src/components/tools/block.ts
+++ b/src/components/tools/block.ts
@@ -87,10 +87,10 @@ export default class BlockTool extends BaseTool<IBlockTool> {
     const userToolboxSettings = this.config[UserSettings.Toolbox];
 
     if (_.isEmpty(toolToolboxSettings)) {
-      return;
+      return [];
     }
     if (userToolboxSettings === false) {
-      return;
+      return [];
     }
     /**
      * Return tool's toolbox settings if user settings are not defined
diff --git a/src/components/ui/toolbox.ts b/src/components/ui/toolbox.ts
index ad4e8414..7becdf84 100644
--- a/src/components/ui/toolbox.ts
+++ b/src/components/ui/toolbox.ts
@@ -255,17 +255,14 @@ export default class Toolbox extends EventsDispatcher<ToolboxEvent> {
       .from(this.tools.values())
       .reduce((result, tool) => {
         const toolToolboxSettings = tool.toolbox;
+        const validToolboxSettings = toolToolboxSettings.filter(item => {
+          return this.areToolboxSettingsValid(item, tool.name);
+        });
 
-        if (toolToolboxSettings) {
-          const validToolboxSettings = toolToolboxSettings.filter(item => {
-            return this.areToolboxSettingsValid(item, tool.name);
-          });
-
-          result.push({
-            ...tool,
-            toolbox: validToolboxSettings,
-          });
-        }
+        result.push({
+          ...tool,
+          toolbox: validToolboxSettings,
+        });
 
         return result;
       }, []);