diff --git a/src/lib/upnp/Device.cxx b/src/lib/upnp/Device.cxx
index 89dac695f..1dc3e8355 100644
--- a/src/lib/upnp/Device.cxx
+++ b/src/lib/upnp/Device.cxx
@@ -64,7 +64,7 @@ protected:
 			trimstring(*value);
 			value = nullptr;
 		} else if (!strcmp(name, "service")) {
-			m_device.services.emplace_back(std::move(m_tservice));
+			m_device.services.emplace_front(std::move(m_tservice));
 			m_tservice = {};
 		}
 	}
diff --git a/src/lib/upnp/Device.hxx b/src/lib/upnp/Device.hxx
index 6c8e896a9..dd0074368 100644
--- a/src/lib/upnp/Device.hxx
+++ b/src/lib/upnp/Device.hxx
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <vector>
+#include <forward_list>
 #include <string>
 
 /**
@@ -43,7 +43,7 @@ public:
 	// Model name: e.g. MediaTomb, DNS-327L ("modelName")
 	std::string modelName;
 	// Services provided by this device.
-	std::vector<UPnPService> services;
+	std::forward_list<UPnPService> services;
 
 	/** Build device from xml description downloaded from discovery
 	 * @param url where the description came from