diff --git a/spectrum/src/main.cpp b/spectrum/src/main.cpp
index 4df436d47731b8b948b5f832b99c69dc014dc375..b966014eeeb1fe0b98da0bbe24e8b6ef9cd49af7 100644
--- a/spectrum/src/main.cpp
+++ b/spectrum/src/main.cpp
@@ -398,7 +398,10 @@ int main(int argc, char **argv)
 
 	FileTransferManager ftManager(&transport, &userManager);
 
-	NetworkPluginServer plugin(&transport, &config, &userManager, &ftManager);
+	DiscoItemsResponder discoItemsResponder(&transport);
+	discoItemsResponder.start();
+
+	NetworkPluginServer plugin(&transport, &config, &userManager, &ftManager, &discoItemsResponder);
 
 	AdminInterface adminInterface(&transport, &userManager, &plugin, storageBackend, userRegistration);
 	plugin.setAdminInterface(&adminInterface);
@@ -409,9 +412,6 @@ int main(int argc, char **argv)
 	GatewayResponder gatewayResponder(transport.getIQRouter(), &userManager);
 	gatewayResponder.start();
 
-	DiscoItemsResponder discoItemsResponder(&transport);
-	discoItemsResponder.start();
-
 	AdHocManager adhocmanager(&transport, &discoItemsResponder, &userManager, storageBackend);
 	adhocmanager.start();