diff --git a/src/ripple_app/websocket/WSConnection.cpp b/src/ripple_app/websocket/WSConnection.cpp
index df8054d..4e3d3bf 100644
--- a/src/ripple_app/websocket/WSConnection.cpp
+++ b/src/ripple_app/websocket/WSConnection.cpp
@@ -23,7 +23,7 @@ SETUP_LOGN (WSConnection, "WSConnection")
 static std::string trimIP(const std::string& ip)
 { // Make sure there's no port
     size_t pos = ip.find(':');
-    return (pos == std::string::npos) ? ip : ip.substr(0, pos - 1);
+    return (pos == std::string::npos) ? ip : ip.substr(0, pos);
 }

 //------------------------------------------------------------------------------
@@ -34,7 +34,7 @@ WSConnection::WSConnection (Resource::Manager& resourceManager,
     : InfoSub (source, usage)
     , m_resourceManager (resourceManager)
     , m_isPublic (isPublic)
-    , m_remoteIP (remoteIP)
+    , m_remoteIP (trimIP(remoteIP))
     , m_receiveQueueMutex (this, "WSConnection", __FILE__, __LINE__)
     , m_netOPs (getApp ().getOPs ())
     , m_pingTimer (io_service)