diff --git a/services/standard-object-database/main/default/services/object_fields.service.js b/services/standard-object-database/main/default/services/object_fields.service.js
index e614547323..cfd3c3d309 100644
--- a/services/standard-object-database/main/default/services/object_fields.service.js
+++ b/services/standard-object-database/main/default/services/object_fields.service.js
@@ -278,9 +278,12 @@ module.exports = {
                     const groups = object.field_groups;
 
                     const getGroup = (groupName)=>{
+                        if(groupName == 'undefined' || groupName == 'null'){
+                            groupName = '';
+                        }
                         return _.find(groups, (group)=>{
                             return group.group_name === groupName;
-                        })
+                        }) || {group_name: groupName}
                     }
 
                     const objectName = object.name;