diff --git a/src/insights.jsx b/src/insights.jsx
index d433e35..b851237 100644
--- a/src/insights.jsx
+++ b/src/insights.jsx
@@ -434,7 +434,7 @@ function show_status_dialog() {
                             <Button variant='link' isInline onClick={left(jump_to_timer)}>{_("Details")}</Button>
                         </Alert>
                         }
-                        { insights_service.state == "failed" && failed_text &&
+                        { (insights_service.state == "failed" || (insights_service.state == "starting" && insights_service.details.Result != "success")) && failed_text &&
                         <Alert variant='warning' title={failed_text}>
                             <Button variant='link' isInline onClick={left(jump_to_service)}>{_("Details")}</Button>
                         </Alert>
@@ -514,7 +514,7 @@ export class InsightsStatus extends React.Component {
         let status;
 
         if (insights_timer.enabled) {
-            let warn = (insights_service.state == "failed" &&
+            let warn = ((insights_service.state == "failed" || (insights_service.state == "starting" && insights_service.details.Result != "success")) &&
                         insights_service.unit.ActiveExitTimestamp &&
                         insights_service.unit.ActiveExitTimestamp / 1e6 > last_upload_monitor.timestamp);
 
diff --git a/test/check-subscriptions b/test/check-subscriptions
index a75a0c1..2d7527a 100755
--- a/test/check-subscriptions
+++ b/test/check-subscriptions
@@ -424,7 +424,7 @@ class TestSubscriptions(SubscriptionsCase):
         # Unbreak it and retry.
         m.execute(["mv", "/etc/insights-client/machine-id.orig", "/etc/insights-client/machine-id"])
         m.execute(
-            "systemctl start insights-client; "
+            "systemctl restart insights-client; "
             "while systemctl --quiet is-active insights-client; do sleep 1; done",
             timeout=360,
         )