diff --git a/lib/livebook_web/live/hub/file_system_form_component.ex b/lib/livebook_web/live/hub/file_system_form_component.ex
index df11a387b..d6e48413d 100644
--- a/lib/livebook_web/live/hub/file_system_form_component.ex
+++ b/lib/livebook_web/live/hub/file_system_form_component.ex
@@ -16,7 +16,8 @@ defmodule LivebookWeb.Hub.FileSystemFormComponent do
     mode = mode(file_system)
     title = title(file_system)
     button = button_attrs(file_system)
-    file_system = file_system || %FileSystem.S3{hub_id: assigns.hub}
+    file_system = file_system || %FileSystem.S3{hub_id: assigns.hub.id}
+
     changeset = FileSystems.change_file_system(file_system)
 
     {:ok,
diff --git a/test/livebook_teams/web/hub/edit_live_test.exs b/test/livebook_teams/web/hub/edit_live_test.exs
index 0be1d1204..5f62c8bf9 100644
--- a/test/livebook_teams/web/hub/edit_live_test.exs
+++ b/test/livebook_teams/web/hub/edit_live_test.exs
@@ -193,7 +193,12 @@ defmodule LivebookWeb.Integration.Hub.EditLiveTest do
       bypass = Bypass.open()
       file_system = build_bypass_file_system(bypass, team.id)
       id = file_system.id
-      attrs = %{file_system: Livebook.FileSystem.dump(file_system)}
+
+      form_values =
+        Map.from_struct(file_system)
+        |> Map.take([:bucket_url, :region, :access_key_id, :secret_access_key])
+
+      attrs = %{file_system: form_values}
 
       expect_s3_listing(bypass)
       refute render(view) =~ file_system.bucket_url
@@ -229,7 +234,12 @@ defmodule LivebookWeb.Integration.Hub.EditLiveTest do
     test "creates a Git file system", %{conn: conn, team: team} do
       id = Livebook.FileSystem.Utils.id("git", team.id, "git@github.com:livebook-dev/test.git")
       file_system = build(:fs_git, id: id, hub_id: team.id)
-      attrs = %{file_system: Livebook.FileSystem.dump(file_system)}
+
+      form_values =
+        Map.from_struct(file_system)
+        |> Map.take([:repo_url, :branch, :key])
+
+      attrs = %{file_system: form_values}
 
       {:ok, view, _html} = live(conn, ~p"/hub/#{team.id}")
       refute render(view) =~ file_system.id
@@ -277,7 +287,11 @@ defmodule LivebookWeb.Integration.Hub.EditLiveTest do
 
       {:ok, view, _html} = live(conn, ~p"/hub/#{team.id}")
 
-      attrs = %{file_system: Livebook.FileSystem.dump(file_system)}
+      form_values =
+        Map.from_struct(file_system)
+        |> Map.take([:bucket_url, :region, :access_key_id, :secret_access_key])
+
+      attrs = %{file_system: form_values}
       expect_s3_listing(bypass)
 
       view
@@ -322,7 +336,12 @@ defmodule LivebookWeb.Integration.Hub.EditLiveTest do
       refute "/another_file.txt" in paths
 
       {:ok, view, _html} = live(conn, ~p"/hub/#{team.id}")
-      attrs = %{file_system: Livebook.FileSystem.dump(file_system)}
+
+      form_values =
+        Map.from_struct(file_system)
+        |> Map.take([:repo_url, :branch, :key])
+
+      attrs = %{file_system: form_values}
       attrs = put_in(attrs.file_system.branch, "test")
 
       view
diff --git a/test/livebook_web/live/hub/edit_live_test.exs b/test/livebook_web/live/hub/edit_live_test.exs
index 850fc0da7..fdf9f59e8 100644
--- a/test/livebook_web/live/hub/edit_live_test.exs
+++ b/test/livebook_web/live/hub/edit_live_test.exs
@@ -165,7 +165,11 @@ defmodule LivebookWeb.Hub.EditLiveTest do
       bypass = Bypass.open()
       file_system = build_bypass_file_system(bypass)
 
-      attrs = %{file_system: Livebook.FileSystem.dump(file_system)}
+      form_values =
+        Map.from_struct(file_system)
+        |> Map.take([:bucket_url, :region, :access_key_id, :secret_access_key])
+
+      attrs = %{file_system: form_values}
 
       expect_s3_listing(bypass)
 
@@ -201,7 +205,12 @@ defmodule LivebookWeb.Hub.EditLiveTest do
     test "creates a Git file system", %{conn: conn, hub: hub} do
       file_system = build(:fs_git)
       id = file_system.id
-      attrs = %{file_system: Livebook.FileSystem.dump(file_system)}
+
+      form_values =
+        Map.from_struct(file_system)
+        |> Map.take([:repo_url, :branch, :key])
+
+      attrs = %{file_system: form_values}
 
       {:ok, view, _html} = live(conn, ~p"/hub/#{hub.id}")
       refute render(view) =~ file_system.id
@@ -246,7 +255,11 @@ defmodule LivebookWeb.Hub.EditLiveTest do
 
       {:ok, view, _html} = live(conn, ~p"/hub/#{hub.id}")
 
-      attrs = %{file_system: Livebook.FileSystem.dump(file_system)}
+      form_values =
+        Map.from_struct(file_system)
+        |> Map.take([:bucket_url, :region, :access_key_id, :secret_access_key])
+
+      attrs = %{file_system: form_values}
 
       expect_s3_listing(bypass)
 
@@ -298,7 +311,12 @@ defmodule LivebookWeb.Hub.EditLiveTest do
       refute "/another_file.txt" in paths
 
       {:ok, view, _html} = live(conn, ~p"/hub/#{hub.id}")
-      attrs = %{file_system: Livebook.FileSystem.dump(file_system)}
+
+      form_values =
+        Map.from_struct(file_system)
+        |> Map.take([:repo_url, :branch, :key])
+
+      attrs = %{file_system: form_values}
       attrs = put_in(attrs.file_system.branch, "test")
 
       view