diff --git a/common/flatpak-context.c b/common/flatpak-context.c
index 34510c15..423212dc 100644
--- a/common/flatpak-context.c
+++ b/common/flatpak-context.c
@@ -1963,7 +1963,8 @@ flatpak_context_save_metadata (FlatpakContext *context,
                                         NULL, &value))
         {
           g_warn_if_fail (GPOINTER_TO_INT (value) == FLATPAK_FILESYSTEM_MODE_NONE);
-          g_ptr_array_add (array, g_strdup ("!host:reset"));
+          if (!flatten)
+            g_ptr_array_add (array, g_strdup ("!host:reset"));
         }
 
       g_hash_table_iter_init (&iter, context->filesystems);
@@ -1971,6 +1972,9 @@ flatpak_context_save_metadata (FlatpakContext *context,
         {
           FlatpakFilesystemMode mode = GPOINTER_TO_INT (value);
 
+          if (flatten && mode == FLATPAK_FILESYSTEM_MODE_NONE)
+            continue;
+
           /* We already did this */
           if (g_str_equal (key, "host-reset"))
             continue;