diff --git a/src/output/output.cpp b/src/output/output.cpp
index 7febf738..942d22dd 100644
--- a/src/output/output.cpp
+++ b/src/output/output.cpp
@@ -525,7 +525,7 @@ namespace Mist {
  
   int Output::run() {
     DEBUG_MSG(DLVL_MEDIUM, "MistOut client handler started");
-    while (myConn.connected() && (wantRequest || parseData)){
+    while (config->is_active && myConn.connected() && (wantRequest || parseData)){
       stats();
       if (wantRequest){
         requestHandler();