diff --git a/comp/aggregator/demultiplexer/demultiplexerimpl/demultiplexer_mock.go b/comp/aggregator/demultiplexer/demultiplexerimpl/demultiplexer_mock.go
index 903af3e876247..aadcb9264fed0 100644
--- a/comp/aggregator/demultiplexer/demultiplexerimpl/demultiplexer_mock.go
+++ b/comp/aggregator/demultiplexer/demultiplexerimpl/demultiplexer_mock.go
@@ -21,7 +21,11 @@ import (
 // MockModule defines the fx options for this component.
 func MockModule() fxutil.Module {
 	return fxutil.Component(
-		fx.Provide(newMock))
+		fx.Provide(newMock),
+		fx.Provide(func(demux demultiplexerComp.Component) aggregator.Demultiplexer {
+			return demux
+		}),
+	)
 }
 
 type mock struct {
diff --git a/comp/dogstatsd/server/server.go b/comp/dogstatsd/server/server.go
index 1b7f021800e47..e1c7cc56373cb 100644
--- a/comp/dogstatsd/server/server.go
+++ b/comp/dogstatsd/server/server.go
@@ -310,8 +310,6 @@ func newServerCompat(cfg config.Reader, log logComponent.Component, capture repl
 
 func (s *server) start(context.Context) error {
 
-	// TODO: (components) - DI this into Server when Demultiplexer is made into a component
-
 	packetsChannel := make(chan packets.Packets, s.config.GetInt("dogstatsd_queue_size"))
 	tmpListeners := make([]listeners.StatsdListener, 0, 2)
 	err := s.tCapture.Configure()