diff --git a/mission/tmtc/TmStore.cpp b/mission/tmtc/TmStore.cpp
index 82ccafe9..8ba37693 100644
--- a/mission/tmtc/TmStore.cpp
+++ b/mission/tmtc/TmStore.cpp
@@ -161,6 +161,7 @@ void TmStore::addApid(uint16_t apid) {
 void TmStore::addService(uint8_t service) {
   if (not filter.services) {
     filter.services = std::vector<uint8_t>({service});
+    return;
   }
   filter.services.value().push_back(service);
 }
@@ -169,6 +170,7 @@ void TmStore::addServiceSubservice(uint8_t service, uint8_t subservice) {
   if (not filter.serviceSubservices) {
     filter.serviceSubservices =
         std::vector<std::pair<uint8_t, uint8_t>>({std::pair(service, subservice)});
+    return;
   }
   filter.serviceSubservices.value().push_back({service, subservice});
 }