diff --git a/src/ripple/websocket/WebSocket02.cpp b/src/ripple/websocket/WebSocket02.cpp
index b194a467b..d91f91bca 100644
--- a/src/ripple/websocket/WebSocket02.cpp
+++ b/src/ripple/websocket/WebSocket02.cpp
@@ -74,6 +74,8 @@ template <>
 void ConnectionImpl <WebSocket02>::setPingTimer ()
 {
     auto freq = getConfig ().WEBSOCKET_PING_FREQ;
+    // VFALCO Disabled since it might cause hangs
+    freq = 0;
     if (freq <= 0)
         return;
     connection_ptr ptr = m_connection.lock ();
diff --git a/src/ripple/websocket/WebSocket04.cpp b/src/ripple/websocket/WebSocket04.cpp
index 287f5a9f5..fa1fde5d9 100644
--- a/src/ripple/websocket/WebSocket04.cpp
+++ b/src/ripple/websocket/WebSocket04.cpp
@@ -116,6 +116,8 @@ template <>
 void ConnectionImpl <WebSocket04>::setPingTimer ()
 {
     auto freq = getConfig ().WEBSOCKET_PING_FREQ;
+    // VFALCO Disabled since it might cause hangs
+    freq = 0;
     if (freq <= 0)
         return;
     if (auto con = m_connection.lock ())