diff --git a/internal/core/core_manager.go b/internal/core/core_manager.go
index 6dfd10b78..1852d2c07 100644
--- a/internal/core/core_manager.go
+++ b/internal/core/core_manager.go
@@ -77,18 +77,14 @@ func (m *CoreManager) Servinfo(broker *plugin.GRPCBroker) ([]byte, error) {
 		return m.srv, nil
 	}
 
-	cleaner := cleanup.New()
-
 	i := intplugin.NewInternal(
 		broker,
 		cacher.New(),
-		cleaner,
+		m.cleanup,
 		m.logger,
 		[]*argmapper.Func{},
 	)
 
-	m.cleanup.Do(func() error { return cleaner.Close() })
-
 	p, err := protomappers.CorePluginManagerProto(m, m.logger, i)
 	if err != nil {
 		m.logger.Warn("failed to create plugin manager grpc server",