diff --git a/sflphone-common/src/audio/audiolayer.cpp b/sflphone-common/src/audio/audiolayer.cpp
index 15f4425b64119c3f6961a50d0cea0cbf8be7a38f..bb71e489831b41f02922e7dd035594f17ff88597 100644
--- a/sflphone-common/src/audio/audiolayer.cpp
+++ b/sflphone-common/src/audio/audiolayer.cpp
@@ -50,18 +50,9 @@ void AudioLayer::flushUrgent (void)
 
 int AudioLayer::putUrgent (void* buffer, int toCopy)
 {
-    int a;
-
     ost::MutexLock guard (_mutex);
-    a = _urgentRingBuffer.AvailForPut();
-
-    if (a >= toCopy) {
-        return _urgentRingBuffer.Put (buffer, toCopy);
-    } else {
-        return _urgentRingBuffer.Put (buffer, a);
-    }
 
-    return 0;
+    return _urgentRingBuffer.Put (buffer, toCopy);
 }
 
 int AudioLayer::putMain (void *buffer, int toCopy, std::string call_id)
diff --git a/sflphone-common/src/audio/mainbuffer.cpp b/sflphone-common/src/audio/mainbuffer.cpp
index f7226052a0d795af791c0964036cf9a9fed7970e..54b1552e3d9ce095375b6ae22f1d72a5b90e0155 100644
--- a/sflphone-common/src/audio/mainbuffer.cpp
+++ b/sflphone-common/src/audio/mainbuffer.cpp
@@ -303,24 +303,10 @@ int MainBuffer::putData (void *buffer, int toCopy, std::string call_id)
     ost::MutexLock guard (_mutex);
 
     RingBuffer* ring_buffer = getRingBuffer (call_id);
-
-    if (ring_buffer == NULL) {
+    if (!ring_buffer)
         return 0;
-    }
-
-    int a;
-
-    a = ring_buffer->AvailForPut();
-
-    if (a >= toCopy) {
-
-        return ring_buffer->Put (buffer, toCopy);
-
-    } else {
-
-        return ring_buffer->Put (buffer, a);
-    }
 
+    return ring_buffer->Put (buffer, toCopy);
 }
 
 int MainBuffer::getData (void *buffer, int toCopy, std::string call_id)
diff --git a/sflphone-common/src/audio/ringbuffer.cpp b/sflphone-common/src/audio/ringbuffer.cpp
index cf918a7338e532a29eb285fc87777fd24e5529a5..96448ccc340f87342cc940d0010b97d154b50cd2 100644
--- a/sflphone-common/src/audio/ringbuffer.cpp
+++ b/sflphone-common/src/audio/ringbuffer.cpp
@@ -178,13 +178,6 @@ RingBuffer::getNbReadPointer()
 //
 // For the writer only:
 //
-int
-RingBuffer::AvailForPut()
-{
-    // Always keep 4 bytes safe (?)
-
-    return mBufferSize - putLen();
-}
 
 // This one puts some data inside the ring buffer.
 int
diff --git a/sflphone-common/src/audio/ringbuffer.h b/sflphone-common/src/audio/ringbuffer.h
index f3ad4b66bbeecf97b431a8abc0fc2ea0450c248d..7289c453706c02ba24b65719035146ed28279c28 100644
--- a/sflphone-common/src/audio/ringbuffer.h
+++ b/sflphone-common/src/audio/ringbuffer.h
@@ -94,12 +94,6 @@ class RingBuffer
 
         int getNbReadPointer();
 
-        /**
-         * To get how much space is available in the buffer to write in
-         * @return int The available size
-         */
-        int AvailForPut (void);
-
         /**
          * Write data in the ring buffer
          * @param buffer Data to copied