diff --git a/backend/src/entities/table-actions/use-cases/find-all-table-actions.use.case.ts b/backend/src/entities/table-actions/use-cases/find-all-table-actions.use.case.ts
index 3c487b0a..1687320e 100644
--- a/backend/src/entities/table-actions/use-cases/find-all-table-actions.use.case.ts
+++ b/backend/src/entities/table-actions/use-cases/find-all-table-actions.use.case.ts
@@ -38,7 +38,7 @@ export class FindTableActionsUseCase
     const formedTableActionsDS = foundTableActions.map((action) => buildCreatedTableActionDS(action));
     return {
       table_name: tableName,
-      display_name: foundTableSettings.display_name,
+      display_name: foundTableSettings?.display_name ? foundTableSettings.display_name : null,
       table_actions: formedTableActionsDS,
     };
   }
diff --git a/frontend/src/config.json b/frontend/src/config.json
index b5c379db..973c0e91 100644
--- a/frontend/src/config.json
+++ b/frontend/src/config.json
@@ -1,4 +1,4 @@
 {
   "#important to keep it /api for prod": true,
-  "baseURL": "/api"
+  "baseURL": "https://app.rocketadmin.com/api"
 }