diff --git a/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/NextProtoNegoServerConnection.java b/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/NextProtoNegoServerConnection.java
index 62b5fa65d5f..831e486e6a7 100644
--- a/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/NextProtoNegoServerConnection.java
+++ b/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/NextProtoNegoServerConnection.java
@@ -123,7 +123,7 @@ public class NextProtoNegoServerConnection extends AbstractConnection implements
     public void protocolSelected(String protocol)
     {
         LOG.debug("{} protocol selected {}", this, protocol);
-        nextProtocol = protocol;
+        nextProtocol = protocol != null ? protocol : defaultProtocol;
         NextProtoNego.remove(engine);
     }
 }