diff --git a/ChangeLog b/ChangeLog
index 2c543c83..63b92d3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,8 +11,7 @@
 
 - support for storing/recovering the server window positions (#357)
 
-TODO Mac audio interface -> crackling
-TODO try to reproduce: Quitting client when server window minimized not handled cleanly #355
+
 
 
 
diff --git a/mac/sound.cpp b/mac/sound.cpp
index e006d247..2d69b0ae 100755
--- a/mac/sound.cpp
+++ b/mac/sound.cpp
@@ -907,7 +907,7 @@ OSStatus CSound::deviceNotification ( AudioDeviceID,
         pSound->EmitReinitRequestSignal ( RS_RELOAD_RESTART_AND_INIT );
     }
 
-/*
+/* NOTE that this code does not solve the crackling sound issue
     if ( inAddresses->mSelector == kAudioDeviceProcessorOverload )
     {
         // xrun handling (it is important to act on xruns under CoreAudio
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 3cc6dab6..838e7145 100755
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -1585,7 +1585,10 @@ bool CProtocol::EvaluateRecorderStateMes(const CVector<uint8_t>& vecData)
     const int iRecorderState =
         static_cast<int> ( GetValFromStream ( vecData, iPos, 1 ) );
 
-    if ( iRecorderState != RS_UNDEFINED ) // ... to be defined ...
+    if ( ( iRecorderState != RS_UNDEFINED ) &&
+         ( iRecorderState != RS_NOT_INITIALISED ) &&
+         ( iRecorderState != RS_NOT_ENABLED ) &&
+         ( iRecorderState != RS_RECORDING ) )
     {
         return true;
     }
diff --git a/src/server.cpp b/src/server.cpp
index 33cffbd4..b14c8e82 100755
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -768,9 +768,6 @@ void CServer::Start()
 
         // emit start signal
         emit Started();
-
-        // send recording state message
-        CreateAndSendRecorderStateForAllConChannels();
     }
 }
 
@@ -790,9 +787,6 @@ void CServer::Stop()
 
         // emit stopped signal
         emit Stopped();
-
-        // send recording state message - to no one
-        CreateAndSendRecorderStateForAllConChannels();
     }
 }