diff --git a/src/main.cpp b/src/main.cpp
index 34d080a06..576784622 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1298,6 +1298,9 @@ int handleCmdLine(bool has_server_config)
             }
             if (can_wan)
             {
+                // Server owner online account will keep online as long as
+                // server is live
+                Online::RequestManager::m_disable_polling = true;
                 NetworkConfig::get()->setIsWAN();
                 NetworkConfig::get()->setIsPublicServer();
                 ServerConfig::loadServerLobbyFromConfig();
diff --git a/src/online/online_player_profile.cpp b/src/online/online_player_profile.cpp
index 716927f3c..2b92801c1 100644
--- a/src/online/online_player_profile.cpp
+++ b/src/online/online_player_profile.cpp
@@ -348,8 +348,6 @@ namespace Online
     OnlinePlayerProfile::PollRequest::PollRequest()
                        : XMLRequest(true)
     {
-        m_disable_sending_log = NetworkConfig::get()->isNetworking() &&
-            NetworkConfig::get()->isServer();
     }   // PollRequest
 
     // ------------------------------------------------------------------------