diff --git a/app/flatpak-builtins-list.c b/app/flatpak-builtins-list.c
index d2c71976..ca4543f3 100644
--- a/app/flatpak-builtins-list.c
+++ b/app/flatpak-builtins-list.c
@@ -440,7 +440,7 @@ flatpak_builtin_list (int argc, char **argv, GCancellable *cancellable, GError *
   if (!opt_app && !opt_runtime)
     {
       opt_app = TRUE;
-      opt_runtime = TRUE;
+      opt_runtime = !opt_app_runtime;
     }
 
   /* Default to showing installation if we're listing multiple installations */
diff --git a/app/flatpak-builtins-remote-ls.c b/app/flatpak-builtins-remote-ls.c
index a0ed537b..bf7d467d 100644
--- a/app/flatpak-builtins-remote-ls.c
+++ b/app/flatpak-builtins-remote-ls.c
@@ -411,7 +411,10 @@ flatpak_builtin_remote_ls (int argc, char **argv, GCancellable *cancellable, GEr
     return FALSE;
 
   if (!opt_app && !opt_runtime)
-    opt_app = opt_runtime = TRUE;
+    {
+      opt_app = TRUE;
+      opt_runtime = !opt_app_runtime;
+    }
 
   if (argc > 2)
     return usage_error (context, _("Too many arguments"), error);