diff --git a/src/modules/Workers/WebService/WebService.cpp b/src/modules/Workers/WebService/WebService.cpp
index da9c050..719e680 100644
--- a/src/modules/Workers/WebService/WebService.cpp
+++ b/src/modules/Workers/WebService/WebService.cpp
@@ -131,7 +131,9 @@ namespace Apostol {
                     auto &Context = m_Servers[index].Value();
                     Context.BTCKeys() = Keys;
 
-                    UpdateOAuth2(Context, m_OAuth2.Object());
+                    if (Context.Status() == Context::csInitialization) {
+                        UpdateOAuth2(Context, m_OAuth2.Object());
+                    }
                 }
             }
         }
diff --git a/src/modules/Workers/WebSocket/WebSocket.cpp b/src/modules/Workers/WebSocket/WebSocket.cpp
index d4f42f4..b85094a 100644
--- a/src/modules/Workers/WebSocket/WebSocket.cpp
+++ b/src/modules/Workers/WebSocket/WebSocket.cpp
@@ -136,7 +136,9 @@ namespace Apostol {
                     auto &Context = m_Servers[index].Value();
                     Context.BTCKeys() = Keys;
 
-                    UpdateOAuth2(Context, m_OAuth2.Object());
+                    if (Context.Status() == Context::csInitialization) {
+                        UpdateOAuth2(Context, m_OAuth2.Object());
+                    }
                 }
             }
         }