diff --git a/src/i18n/i18n.ts b/src/i18n/i18n.ts
index b4b40ac..6493981 100644
--- a/src/i18n/i18n.ts
+++ b/src/i18n/i18n.ts
@@ -30,6 +30,10 @@ i18n
     backend: {
       loadPath: "/locales/{{lng}}/{{ns}}.json",
     },
+    react: {
+      useSuspense: false,
+      returnNull: false,
+    },
   });
 
 export default i18n;
diff --git a/src/modules/manager/workflowTemplates/components/AddTaskButton.tsx b/src/modules/manager/workflowTemplates/components/AddTaskButton.tsx
index dea0943..791278e 100644
--- a/src/modules/manager/workflowTemplates/components/AddTaskButton.tsx
+++ b/src/modules/manager/workflowTemplates/components/AddTaskButton.tsx
@@ -15,8 +15,8 @@ const AddTaskButton: React.FC<AddTaskButtonProps> = ({ taskType, onAdd }) => {
   const [items, setItems] = React.useState<TaskMetadata[]>([]);
   const [loading, setLoading] = React.useState(false);
 
-  const { t } = useTranslation(Namespaces.Common);
   const { t: tTaskType } = useTranslation(Namespaces.TaskTypes);
+  const { t } = useTranslation(Namespaces.Common);
 
   const toggle = async () => {
     const next = !open;