diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index d7ccf78de..79f6e1a76 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -3056,7 +3056,7 @@ private void ListTab_SelectedIndexChanged(object sender, EventArgs e)
         {
             this.SetMainWindowTitle();
             this.SetStatusLabelUrl();
-            this.SetApiStatusLabel(null);
+            this.SetApiStatusLabel(this.CurrentTabAccount.AccountState.RateLimits);
             if (this.ListTab.Focused || ((Control)this.CurrentTabPage.Tag).Focused)
                 this.Tag = this.ListTab.Tag;
             this.TabMenuControl(this.CurrentTabName);
@@ -6850,15 +6850,8 @@ private async void TwitterApiStatus_AccessLimitUpdated(RateLimitCollection sende
             }
         }
 
-        private void SetApiStatusLabel(RateLimitCollection? rateLimits, string? endpointName = null)
+        private void SetApiStatusLabel(RateLimitCollection rateLimits, string? endpointName = null)
         {
-            if (rateLimits == null)
-            {
-                this.toolStripApiGauge.ApiLimit = null;
-                this.toolStripApiGauge.ApiEndpoint = endpointName;
-                return;
-            }
-
             var tabType = this.CurrentTab.TabType;
 
             if (endpointName == null)