diff --git a/src/libtomahawk/network/servent.cpp b/src/libtomahawk/network/servent.cpp
index 2b043e9bc..87d48a8b1 100644
--- a/src/libtomahawk/network/servent.cpp
+++ b/src/libtomahawk/network/servent.cpp
@@ -123,7 +123,7 @@ Servent::startListening( QHostAddress ha, bool upnp, int port )
 
 
 QString
-Servent::createConnectionKey( const QString& name, const QString &nodeid, const QString &key )
+Servent::createConnectionKey( const QString& name, const QString &nodeid, const QString &key, bool onceOnly )
 {
     qDebug() << Q_FUNC_INFO;
     Q_ASSERT( this->thread() == QThread::currentThread() );
@@ -133,7 +133,8 @@ Servent::createConnectionKey( const QString& name, const QString &nodeid, const
     cc->setName( name.isEmpty() ? QString( "KEY(%1)" ).arg( key ) : name );
     if( !nodeid.isEmpty() )
         cc->setId( nodeid );
-    qDebug() << "Creating connection key with name of " << cc->name() << " and id of " << cc->id() << " and key of " << _key;
+    cc->setOnceOnly( onceOnly );
+    qDebug() << "Creating connection key with name of " << cc->name() << " and id of " << cc->id() << " and key of " << _key << "; key is once only? : " << (onceOnly ? "true" : "false");
     registerOffer( _key, cc );
     return _key;
 }
diff --git a/src/libtomahawk/network/servent.h b/src/libtomahawk/network/servent.h
index add40c098..d67fedd2a 100644
--- a/src/libtomahawk/network/servent.h
+++ b/src/libtomahawk/network/servent.h
@@ -78,7 +78,7 @@ public:
     int port() const { return m_port; }
 
     // creates new token that allows a controlconnection to be set up
-    QString createConnectionKey( const QString& name = "", const QString &nodeid = "", const QString &key = "" );
+    QString createConnectionKey( const QString& name = "", const QString &nodeid = "", const QString &key = "", bool onceOnly = true );
 
     void registerOffer( const QString& key, Connection* conn );
 
diff --git a/src/sip/twitter/twitter.cpp b/src/sip/twitter/twitter.cpp
index c92520752..6f92fdff7 100644
--- a/src/sip/twitter/twitter.cpp
+++ b/src/sip/twitter/twitter.cpp
@@ -350,7 +350,7 @@ TwitterPlugin::registerOffer( const QString &screenName, const QHash< QString, Q
     if( needToAddToCache )
     {
         qDebug() << "TwitterPlugin registering offer to " << node << " with node " << node << " and offeredkey " << _peerData["okey"].toString();
-        m_keyCache << Servent::instance()->createConnectionKey( node, node, _peerData["okey"].toString() );
+        m_keyCache << Servent::instance()->createConnectionKey( node, node, _peerData["okey"].toString(), false );
     }
         
     if( needToSend )