diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/scopes/SimpleContainerScope.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/scopes/SimpleContainerScope.java
index 8b00a84601b..11dcbefeaad 100644
--- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/scopes/SimpleContainerScope.java
+++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/scopes/SimpleContainerScope.java
@@ -84,7 +84,10 @@ public class SimpleContainerScope extends ContainerLifeCycle implements WebSocke
 
         if (ssl == null)
         {
-            this.sslContextFactory = new SslContextFactory.Server();
+            if (policy.getBehavior() == WebSocketBehavior.CLIENT)
+                this.sslContextFactory = new SslContextFactory.Client();
+            else if (policy.getBehavior() == WebSocketBehavior.SERVER)
+                this.sslContextFactory = new SslContextFactory.Server();
         }
         else
         {