diff --git a/openbb_terminal/config_terminal.py b/openbb_terminal/config_terminal.py
index 1edaa6da370..5be8539f469 100644
--- a/openbb_terminal/config_terminal.py
+++ b/openbb_terminal/config_terminal.py
@@ -5,6 +5,17 @@ import os
 from openbb_terminal.base_helpers import load_env_vars, strtobool
 from .helper_classes import TerminalStyle as _TerminalStyle
 
+SENSITIVE_KEYS = [
+    "RH_USERNAME",
+    "RH_PASSWORD",
+    "DG_USERNAME",
+    "DG_PASSWORD",
+    "DG_TOTP_SECRET",
+    "OANDA_ACCOUNT_TYPE",
+    "OANDA_ACCOUNT",
+    "OANDA_TOKEN",
+]
+
 # Terminal UX section
 MPL_STYLE = os.getenv("OPENBB_MPLSTYLE") or "dark"
 PMF_STYLE = os.getenv("OPENBB_PMFSTYLE") or "dark"
diff --git a/openbb_terminal/keys_model.py b/openbb_terminal/keys_model.py
index 6835a821124..7846d64e983 100644
--- a/openbb_terminal/keys_model.py
+++ b/openbb_terminal/keys_model.py
@@ -240,7 +240,11 @@ def set_key(env_var_name: str, env_var_value: str, persist: bool = False) -> Non
     setattr(cfg, env_var_name, env_var_value)
 
     # Send api key to server
-    if not User.is_guest():
+    if (
+        not User.is_guest()
+        and env_var_name not in cfg.SENSITIVE_KEYS
+        and env_var_name.startswith("API_")
+    ):
         patch_user_configs(key=env_var_name, value=env_var_value, type_="keys")