diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index b320515e61bbe9e8616ffe43f46c39b9617a2fe6..f4df5d8d28a7eba4ffc949d0ac5f2bf8f9185ef9 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -61,14 +61,7 @@ from common import ged
 from common import nec
 from common.nec import NetworkEvent
 
-if gajim.HAVE_FARSIGHT:
-    from common.jingle import ConnectionJingle
-else:
-    class ConnectionJingle():
-        def __init__(self):
-            pass
-        def _JingleCB(self, con, stanza):
-            pass
+from common.jingle import ConnectionJingle
 
 from common import dbus_support
 if dbus_support.supported:
diff --git a/src/common/jingle.py b/src/common/jingle.py
index ae8c6509d4ad029a6349392b081689e3555c4806..a8620f83c036e6e3f37cf4b7ed91e75e72bc9cb7 100644
--- a/src/common/jingle.py
+++ b/src/common/jingle.py
@@ -32,9 +32,11 @@ Handles the jingle signalling protocol
 
 import xmpp
 import helpers
+import gajim
 
 from jingle_session import JingleSession, JingleStates
-from jingle_rtp import JingleAudio, JingleVideo
+if gajim.HAVE_FARSIGHT:
+    from jingle_rtp import JingleAudio, JingleVideo
 
 
 class ConnectionJingle(object):