diff --git a/src/kex.c b/src/kex.c
index 6a34a712..4e47f2d0 100644
--- a/src/kex.c
+++ b/src/kex.c
@@ -3527,8 +3527,9 @@ libssh2_session_method_pref(LIBSSH2_SESSION * session, int method_type,
                 }
             }
         }
-
-        s = p ? (p + 1) : NULL;
+        else {
+            s = p ? (p + 1) : NULL;
+        }
     }
 
     if(strlen(newprefs) == 0) {