diff --git a/fairmq/SuboptParser.cxx b/fairmq/SuboptParser.cxx
index 1d48563c..4e9a3dc5 100644
--- a/fairmq/SuboptParser.cxx
+++ b/fairmq/SuboptParser.cxx
@@ -79,7 +79,7 @@ Properties SuboptParser(const vector<string>& channelConfig, const string& devic
 
     ptree channelsArray;
 
-    for (auto token : channelConfig) {
+    for (const auto& token : channelConfig) {
         string channelName;
         ptree channelProperties;
 
diff --git a/fairmq/shmem/Poller.h b/fairmq/shmem/Poller.h
index d37b8643..a2921769 100644
--- a/fairmq/shmem/Poller.h
+++ b/fairmq/shmem/Poller.h
@@ -71,7 +71,7 @@ class Poller final : public fair::mq::Poller
         try {
             int offset = 0;
             // calculate offsets and the total size of the poll item set
-            for (std::string channel : channelList) {
+            for (const std::string& channel : channelList) {
                 fOffsetMap[channel] = offset;
                 offset += channelsMap.at(channel).size();
                 fNumItems += channelsMap.at(channel).size();
@@ -80,7 +80,7 @@ class Poller final : public fair::mq::Poller
             fItems = new zmq_pollitem_t[fNumItems];
 
             int index = 0;
-            for (std::string channel : channelList) {
+            for (const std::string& channel : channelList) {
                 for (unsigned int i = 0; i < channelsMap.at(channel).size(); ++i) {
                     index = fOffsetMap[channel] + i;
 
diff --git a/fairmq/zeromq/Poller.h b/fairmq/zeromq/Poller.h
index bd708e97..b1ceda20 100644
--- a/fairmq/zeromq/Poller.h
+++ b/fairmq/zeromq/Poller.h
@@ -86,7 +86,7 @@ class Poller final : public fair::mq::Poller
             fItems = new zmq_pollitem_t[fNumItems];
 
             int index = 0;
-            for (std::string channel : channelList) {
+            for (const std::string& channel : channelList) {
                 for (unsigned int i = 0; i < channelsMap.at(channel).size(); ++i) {
                     index = fOffsetMap[channel] + i;