diff --git a/fairmq/FairMQDevice.cxx b/fairmq/FairMQDevice.cxx
index 7440e63c..6d389eb1 100644
--- a/fairmq/FairMQDevice.cxx
+++ b/fairmq/FairMQDevice.cxx
@@ -73,6 +73,7 @@ void FairMQDevice::InitInput()
       }
     } catch (std::out_of_range& e) {
     }
+  }
 }
 
 void FairMQDevice::InitOutput()
@@ -95,6 +96,7 @@ void FairMQDevice::InitOutput()
       }
     } catch (std::out_of_range& e) {
     }
+  }
 }
 
 void FairMQDevice::Run()
diff --git a/fairmq/zeromq/FairMQSocketZMQ.cxx b/fairmq/zeromq/FairMQSocketZMQ.cxx
index 75a09180..963f7d46 100644
--- a/fairmq/zeromq/FairMQSocketZMQ.cxx
+++ b/fairmq/zeromq/FairMQSocketZMQ.cxx
@@ -39,17 +39,9 @@ FairMQSocketZMQ::FairMQSocketZMQ(const string& type, int num, int numIoThreads)
     if (rc != 0) {
       LOG(ERROR) << "failed setting socket option, reason: " << zmq_strerror(errno);
     }
+  }
 
-    if (type == "sub")
-    {
-        rc = zmq_setsockopt(fSocket, ZMQ_SUBSCRIBE, NULL, 0);
-        if (rc != 0)
-        {
-            LOG(ERROR) << "failed setting socket option, reason: " << zmq_strerror(errno);
-        }
-    }
-
-    LOG(INFO) << "created socket #" << fId;
+  LOG(INFO) << "created socket #" << fId;
 }
 
 string FairMQSocketZMQ::GetId()