diff --git a/frontend/src/public/components/TemplateEdit/ExtraFields/utils/useDatasetOptions.ts b/frontend/src/public/components/TemplateEdit/ExtraFields/utils/useDatasetOptions.ts
index d1dbe3194..bc0248d1c 100644
--- a/frontend/src/public/components/TemplateEdit/ExtraFields/utils/useDatasetOptions.ts
+++ b/frontend/src/public/components/TemplateEdit/ExtraFields/utils/useDatasetOptions.ts
@@ -22,7 +22,9 @@ export function useDatasetOptions(fields: IExtraField[]) {
   }, [hasDatasetFields, isDatasetsLoaded, isDatasetsLoading, dispatch]);
 
   return useMemo(
-    () => datasetsList.map((dataset) => ({ label: dataset.name, value: String(dataset.id) })),
+    () => datasetsList
+      .filter(({ itemsCount }) => itemsCount > 0)
+      .map(({ name, id }) => ({ label: name, value: String(id) })),
     [datasetsList],
   );
 }
diff --git a/frontend/src/public/utils/dataset.ts b/frontend/src/public/utils/dataset.ts
index a8f1cc4b4..7d48a124f 100644
--- a/frontend/src/public/utils/dataset.ts
+++ b/frontend/src/public/utils/dataset.ts
@@ -14,10 +14,10 @@ export function getSortedAndFilteredDatasetItems(
 
   result.sort((a, b) => {
     if (sorting === EDatasetsSorting.NameAsc) {
-      return a.value.localeCompare(b.value);
+      return a.value.localeCompare(b.value, undefined, { numeric: true });
     }
     if (sorting === EDatasetsSorting.NameDesc) {
-      return b.value.localeCompare(a.value);
+      return b.value.localeCompare(a.value, undefined, { numeric: true });
     }
     if (sorting === EDatasetsSorting.DateAsc) {
       return a.order - b.order;