diff --git a/websocket-sharp/Server/WebSocketBehavior.cs b/websocket-sharp/Server/WebSocketBehavior.cs
index 097ab9d2..420af782 100644
--- a/websocket-sharp/Server/WebSocketBehavior.cs
+++ b/websocket-sharp/Server/WebSocketBehavior.cs
@@ -628,7 +628,9 @@ namespace WebSocketSharp.Server
 
       _websocket = context.WebSocket;
       _websocket.CustomHandshakeRequestChecker = checkHandshakeRequest;
-      _websocket.EmitOnPing = _emitOnPing;
+
+      if (_emitOnPing)
+        _websocket.EmitOnPing = true;
 
       if (_ignoreExtensions)
         _websocket.IgnoreExtensions = true;