diff --git a/openbb_terminal/session/hub_model.py b/openbb_terminal/session/hub_model.py
index 729578c23c9..2a3daf37c3f 100644
--- a/openbb_terminal/session/hub_model.py
+++ b/openbb_terminal/session/hub_model.py
@@ -54,9 +54,7 @@ def delete_session(base_url=BASE_URL):
             json={"token": User.get_token()},
             timeout=TIMEOUT,
         )
-        if response.status_code == 200:
-            console.print("[green]Server session deleted.[/green]")
-        else:
+        if response.status_code != 200:
             console.print("[red]Failed to delete server session.[/red]")
         return response
     except requests.exceptions.ConnectionError:
diff --git a/openbb_terminal/session/session_model.py b/openbb_terminal/session/session_model.py
index 54032b144b8..6aeaa398f58 100644
--- a/openbb_terminal/session/session_model.py
+++ b/openbb_terminal/session/session_model.py
@@ -73,8 +73,11 @@ def logout(cls: bool = False):
     if cls:
         system_clear()
 
+    success = True
     if not User.is_guest():
-        Hub.delete_session()
+        r = Hub.delete_session()
+        if r and r.status_code != 200:
+            success = False
     User.clear()
 
     # Clear openbb environment variables
@@ -92,10 +95,15 @@ def logout(cls: bool = False):
         if module.startswith("openbb"):
             importlib.reload(sys.modules[module])
 
-    Local.remove_session_file()
-    Local.remove_cli_history_file()
+    if not Local.remove_session_file():
+        success = False
+
+    if not Local.remove_cli_history_file():
+        success = False
     plt.close("all")
-    console.print("[green]\nLogout successful.[/green]")
+
+    if success:
+        console.print("[green]\nLogout successful.[/green]")
 
 
 def get_color() -> str: