diff --git a/src/emsesp.cpp b/src/emsesp.cpp
index b939ab083..75aae0205 100644
--- a/src/emsesp.cpp
+++ b/src/emsesp.cpp
@@ -56,8 +56,8 @@ WebLogService      EMSESP::webLogService      = WebLogService(&webServer, EMSESP
 using DeviceFlags = EMSdevice;
 using DeviceType  = EMSdevice::DeviceType;
 
-std::vector<std::unique_ptr<EMSdevice>> EMSESP::emsdevices;      // array of all the detected EMS devices
-std::vector<EMSESP::Device_record>      EMSESP::device_library_; // library of all our known EMS devices, in heap
+std::deque<std::unique_ptr<EMSdevice>> EMSESP::emsdevices;      // array of all the detected EMS devices
+std::vector<EMSESP::Device_record>     EMSESP::device_library_; // library of all our known EMS devices, in heap
 
 uuid::log::Logger EMSESP::logger_{F_(emsesp), uuid::log::Facility::KERN};
 uuid::log::Logger EMSESP::logger() {
diff --git a/src/emsesp.h b/src/emsesp.h
index 214304bf8..360642bff 100644
--- a/src/emsesp.h
+++ b/src/emsesp.h
@@ -220,7 +220,7 @@ class EMSESP {
 
     static bool return_not_found(JsonObject output, const char * msg, const char * cmd);
 
-    static std::vector<std::unique_ptr<EMSdevice>> emsdevices;
+    static std::deque<std::unique_ptr<EMSdevice>> emsdevices;
 
     // services
     static Mqtt              mqtt_;