diff --git a/api/src/i18n/controllers/translation.controller.spec.ts b/api/src/i18n/controllers/translation.controller.spec.ts
index 87e56d6f..484c90a2 100644
--- a/api/src/i18n/controllers/translation.controller.spec.ts
+++ b/api/src/i18n/controllers/translation.controller.spec.ts
@@ -141,7 +141,9 @@ describe('TranslationController', () => {
     translationController = module.get<TranslationController>(
       TranslationController,
     );
-    translation = await translationService.findOne({ str: 'Welcome' });
+    translation = (await translationService.findOne({
+      str: 'Welcome',
+    })) as Translation;
   });
 
   afterEach(jest.clearAllMocks);
@@ -164,7 +166,9 @@ describe('TranslationController', () => {
 
       expect(translationService.findOne).toHaveBeenCalledWith(translation.id);
       expect(result).toEqualPayload(
-        translationFixtures.find(({ str }) => str === translation.str),
+        translationFixtures.find(
+          ({ str }) => str === translation.str,
+        ) as Translation,
       );
     });
   });
diff --git a/api/src/i18n/services/translation.service.ts b/api/src/i18n/services/translation.service.ts
index a5770794..117411c6 100644
--- a/api/src/i18n/services/translation.service.ts
+++ b/api/src/i18n/services/translation.service.ts
@@ -100,6 +100,7 @@ export class TranslationService extends BaseService<Translation> {
     }
     // Add fallback messages
     if (
+      block.options &&
       'fallback' in block.options &&
       block.options.fallback &&
       'message' in block.options.fallback &&