diff --git a/packages/plugins/graph-collection-manager/src/client/GraphDrawPage.tsx b/packages/plugins/graph-collection-manager/src/client/GraphDrawPage.tsx
index 655b66c68..7b6490d4d 100644
--- a/packages/plugins/graph-collection-manager/src/client/GraphDrawPage.tsx
+++ b/packages/plugins/graph-collection-manager/src/client/GraphDrawPage.tsx
@@ -375,9 +375,10 @@ export const GraphDrawPage = React.memo(() => {
   const [collectionData, setCollectionData] = useState<any>([]);
   const [collectionList, setCollectionList] = useState<any>([]);
   const { refreshCM } = useCollectionManager();
+  const currentAppInfo = useCurrentAppInfo();
   const {
     data: { database },
-  } = useCurrentAppInfo();
+  } = currentAppInfo;
   const categoryCtx = useContext(CollectionCategroriesContext);
   const scope = { ...options?.scope };
   const components = { ...options?.components };
@@ -506,7 +507,7 @@ export const GraphDrawPage = React.memo(() => {
       {
         inherit: 'react-shape',
         component: (node) => (
-          <CurrentAppInfoContext.Provider value={database}>
+          <CurrentAppInfoContext.Provider value={currentAppInfo}>
             <APIClientProvider apiClient={api}>
               <SchemaComponentOptions inherit scope={scope} components={components}>
                 <CollectionCategroriesProvider {...categoryCtx}>
diff --git a/packages/plugins/graph-collection-manager/src/client/components/Entity.tsx b/packages/plugins/graph-collection-manager/src/client/components/Entity.tsx
index 3c7afddf9..2895668e2 100644
--- a/packages/plugins/graph-collection-manager/src/client/components/Entity.tsx
+++ b/packages/plugins/graph-collection-manager/src/client/components/Entity.tsx
@@ -186,6 +186,7 @@ const PortsCom = React.memo<any>(({ targetGraph, collectionData, setTargetNode,
   const [collapse, setCollapse] = useState(false);
   const { t } = useGCMTranslation();
   const compile = useCompile();
+  const { styles } = useStyles();
   const {
     data: { database },
   } = useCurrentAppInfo();
@@ -204,9 +205,7 @@ const PortsCom = React.memo<any>(({ targetGraph, collectionData, setTargetNode,
     return `${prefix || ''}${uid()}`;
   };
   const CollectionConten = (data) => {
-    const { styles } = useStyles();
     const { type, name, primaryKey, allowNull, autoIncrement } = data;
-
     return (
       <div className={styles.collectionPopoverClass}>
         <div className="field-content">