diff --git a/src/common/jingle_session.py b/src/common/jingle_session.py
index 5153a2044..5fe112221 100644
--- a/src/common/jingle_session.py
+++ b/src/common/jingle_session.py
@@ -229,7 +229,7 @@ class JingleSession(object):
         """
         Return True when all codecs and candidates are ready (for all contents)
         """
-        return (all((content.is_ready() for content in self.contents.itervalues()))
+        return (any((content.is_ready() for content in self.contents.itervalues()))
                 and self.accepted)
 
     def accept_session(self):
@@ -592,7 +592,8 @@ class JingleSession(object):
         # TODO: integrate with __appendContent?
         # TODO: parameters 'name', 'content'?
         for content in self.contents.values():
-            self.__append_content(jingle, content)
+            if content.is_ready():
+                self.__append_content(jingle, content)
 
     def __session_initiate(self):
         assert self.state == JingleStates.ended