1 files changed, 6 insertions, 1 deletions
diff --git a/cli/mmcli-modem.c b/cli/mmcli-modem.c
index 8974f10f..2b4dfbc5 100644
--- a/cli/mmcli-modem.c
+++ b/cli/mmcli-modem.c
@@ -108,7 +108,11 @@ mmcli_modem_get_option_group (void)
 gboolean
 mmcli_modem_options_enabled (void)
 {
-    guint n_actions;
+    static guint n_actions = 0;
+    static gboolean checked = FALSE;
+
+    if (checked)
+        return !!n_actions;
 
     n_actions = (monitor_state_flag +
                  enable_flag +
@@ -136,6 +140,7 @@ mmcli_modem_options_enabled (void)
     if (info_flag)
         mmcli_force_sync_operation ();
 
+    checked = TRUE;
     return !!n_actions;
 }