diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/CustomConnection.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/CustomConnection.tsx
index 1e4172bcd8..9ff09f9cfb 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/CustomConnection.tsx
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/CustomConnection.tsx
@@ -22,14 +22,13 @@ export const CustomConnection = observer(function CustomConnection() {
   const service = useService(ConnectionManualService);
   const dbDriverResource = useMapResource(CustomConnection, DBDriverResource, CachedMapAllKey);
 
-  const loading = dbDriverResource.isLoading();
   const drivers = useMemo(() => computed(() => (
     dbDriverResource.resource.enabledDrivers.slice().sort(dbDriverResource.resource.compare)
   )), [dbDriverResource]);
 
-  if (loading) {
-    return <Loader />;
-  }
-
-  return <DriverList drivers={drivers.get()} onSelect={service.select} />;
+  return (
+    <Loader state={[dbDriverResource]}>
+      <DriverList drivers={drivers.get()} onSelect={service.select} />
+    </Loader>
+  );
 });