diff --git a/devices/xtrx/devicextrx.cpp b/devices/xtrx/devicextrx.cpp
index 20efc6cc2..6ca841709 100644
--- a/devices/xtrx/devicextrx.cpp
+++ b/devices/xtrx/devicextrx.cpp
@@ -53,8 +53,7 @@ bool DeviceXTRX::open(const char* deviceStr)
     int res;
     qDebug("DeviceXTRX::open: serial: %s", (const char *) deviceStr);
 
-    //res = xtrx_open(deviceStr, XTRX_O_RESET | 4, &m_dev);
-    res = xtrx_open(deviceStr, 4, &m_dev);
+    res = xtrx_open(deviceStr, XTRX_O_RESET | 4, &m_dev);
 
     if (res)
     {
diff --git a/plugins/samplesink/xtrxoutput/xtrxoutput.cpp b/plugins/samplesink/xtrxoutput/xtrxoutput.cpp
index ecff4d2cd..08b20720d 100644
--- a/plugins/samplesink/xtrxoutput/xtrxoutput.cpp
+++ b/plugins/samplesink/xtrxoutput/xtrxoutput.cpp
@@ -332,14 +332,14 @@ bool XTRXOutput::start()
     xtrxOutputThread->setFifo(requestedChannel, &m_sampleSourceFifo);
     xtrxOutputThread->setLog2Interpolation(requestedChannel, m_settings.m_log2SoftInterp);
 
+    applySettings(m_settings, true);
+
     if (needsStart)
     {
         qDebug("XTRXOutput::start: (re)start thread");
         xtrxOutputThread->startWork();
     }
 
-    applySettings(m_settings, true);
-
     qDebug("XTRXOutput::start: started");
     m_running = true;
 
@@ -411,8 +411,8 @@ void XTRXOutput::stop()
             ((DeviceXTRXShared*) (*it)->getBuddySharedPtr())->m_thread = 0;
         }
 
-        xtrxOutputThread->startWork();
         applySettings(m_settings, true);
+        xtrxOutputThread->startWork();
     }
 
     m_running = false;