diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc
index b3bb0db56c..29e38795ca 100644
--- a/src/broker/Manager.cc
+++ b/src/broker/Manager.cc
@@ -76,6 +76,7 @@ static inline void set_option(const char* option, const T& value)
 		auto ptr = make_intrusive<VectorVal>(zeek::id::string_vec);
 		for ( const auto& str : value )
 			ptr->Append(make_intrusive<StringVal>(str));
+		id->SetVal(std::move(ptr));
 		}
 	else
 		{
diff --git a/src/broker/comm.bif b/src/broker/comm.bif
index 9f5e2724b2..a6f7876766 100644
--- a/src/broker/comm.bif
+++ b/src/broker/comm.bif
@@ -178,12 +178,12 @@ function Broker::__set_metrics_export_prefixes%(filter: string_vec%): bool
 	%{
 	zeek::Broker::Manager::ScriptScopeGuard ssg;
 	if ( broker_mgr )
-	{
+		{
 		std::vector<std::string> slist;
 		auto* vval = filter->AsVectorVal();
 		for ( unsigned index = 0; index < vval->Size(); ++index )
 			slist.emplace_back(vval->StringValAt(index)->ToStdString());
 		broker_mgr->SetMetricsExportPrefixes(std::move(slist));
-	}
+		}
 	return zeek::val_mgr->True();
 	%}