diff --git a/gtk/main.c b/gtk/main.c
index c166cf135..34d32ba31 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -437,6 +437,7 @@ main( int     argc,
         /* initialize the libtransmission session */
         session = tr_sessionInit( "gtk", configDir, TRUE, pref_get_all( ) );
         pref_flag_set( TR_PREFS_KEY_ALT_SPEED_ENABLED, tr_sessionUsesAltSpeed( session ) );
+        pref_int_set( TR_PREFS_KEY_PEER_PORT, tr_sessionGetPeerPort( session ) );
         cbdata->core = tr_core_new( session );
 
         /* create main window now to be a parent to any error dialogs */
@@ -939,10 +940,6 @@ prefschanged( TrCore * core UNUSED,
     {
         tr_setMessageLevel( pref_int_get( key ) );
     }
-    else if( !strcmp( key, TR_PREFS_KEY_PEER_PORT_RANDOM_ON_START ) )
-    {
-        /* FIXME */
-    }
     else if( !strcmp( key, TR_PREFS_KEY_PEER_PORT ) )
     {
         tr_sessionSetPeerPort( tr, pref_int_get( key ) );