diff --git a/src/facilities.c b/src/facilities.c
index da2eb19..3ec5a84 100644
--- a/src/facilities.c
+++ b/src/facilities.c
@@ -584,7 +584,8 @@ int main() {
 
     // Exit
 cleanup:
-    pthread_join(facilities.evcsn_service, NULL);
+    if (facilities.evm_args.activate)
+        pthread_join(facilities.evcsn_service, NULL);
     pthread_join(facilities.ca_service, NULL);
     pthread_join(facilities.den_service, NULL);
     pthread_join(facilities.infrastructure_service, NULL);