diff --git a/DesktopEdge/Views/Screens/IdentityDetails.xaml.cs b/DesktopEdge/Views/Screens/IdentityDetails.xaml.cs
index 80c74d17..3a15ea1f 100644
--- a/DesktopEdge/Views/Screens/IdentityDetails.xaml.cs
+++ b/DesktopEdge/Views/Screens/IdentityDetails.xaml.cs
@@ -238,7 +238,8 @@ namespace ZitiDesktopEdge {
 						}
 
 					} else {
-						TimeoutDetails.Text = "Timed Out";
+						if (info.TimeoutRemaining == 0) TimeoutDetails.Text = "Timed Out";
+						else TimeoutDetails.Text = "Never";
 					}
 				} else {
 					TimeoutDetails.Text = "Never";