diff --git a/packages/ui-app/src/InputExtrinsic/options/method.tsx b/packages/ui-app/src/InputExtrinsic/options/method.tsx
index ce41a9daed..e6d109704e 100644
--- a/packages/ui-app/src/InputExtrinsic/options/method.tsx
+++ b/packages/ui-app/src/InputExtrinsic/options/method.tsx
@@ -10,7 +10,7 @@ import ApiPromise from '@polkadot/api/promise';
 export default function createOptions (api: ApiPromise, sectionName: string): DropdownOptions {
   const section = api.tx[sectionName];
 
-  if (!section) {
+  if (!section || Object.keys(section).length === 0) {
     return [];
   }
 
diff --git a/packages/ui-app/src/InputExtrinsic/options/section.ts b/packages/ui-app/src/InputExtrinsic/options/section.ts
index d0aa01dc65..155cf496f7 100644
--- a/packages/ui-app/src/InputExtrinsic/options/section.ts
+++ b/packages/ui-app/src/InputExtrinsic/options/section.ts
@@ -10,6 +10,7 @@ export default function createOptions (api: ApiPromise): DropdownOptions {
   return Object
     .keys(api.tx)
     .sort()
+    .filter((name) => Object.keys(api.tx[name]).length)
     .map((name) => ({
       text: name,
       value: name
diff --git a/packages/ui-app/src/InputStorage/options/key.tsx b/packages/ui-app/src/InputStorage/options/key.tsx
index 3613459f9c..cd5b228bbb 100644
--- a/packages/ui-app/src/InputStorage/options/key.tsx
+++ b/packages/ui-app/src/InputStorage/options/key.tsx
@@ -11,7 +11,7 @@ import ApiPromise from '@polkadot/api/promise';
 export default function createOptions (api: ApiPromise, sectionName: string): DropdownOptions {
   const section = api.query[sectionName];
 
-  if (!section) {
+  if (!section || Object.keys(section).length === 0) {
     return [];
   }
 
diff --git a/packages/ui-app/src/InputStorage/options/section.ts b/packages/ui-app/src/InputStorage/options/section.ts
index ec13d3c517..c8ec418aba 100644
--- a/packages/ui-app/src/InputStorage/options/section.ts
+++ b/packages/ui-app/src/InputStorage/options/section.ts
@@ -10,6 +10,7 @@ export default function createOptions (api: ApiPromise): DropdownOptions {
   return Object
     .keys(api.query)
     .sort()
+    .filter((name) => Object.keys(api.query[name]).length)
     .map((name) => ({
       text: name,
       value: name