diff --git a/app/controllers/api/workspaces_controller.rb b/app/controllers/api/workspaces_controller.rb
index 564b27532..50c83152f 100644
--- a/app/controllers/api/workspaces_controller.rb
+++ b/app/controllers/api/workspaces_controller.rb
@@ -28,6 +28,8 @@ def create
       # tables references from the "public" schema instead:
       #
       connection = ActiveRecord::Base.connection
+      connection.execute("DROP TABLE \"#{workspace_schema}\".team_user CASCADE")
+      connection.execute("DROP TABLE \"#{workspace_schema}\".teams CASCADE")
       connection.execute("DROP TABLE \"#{workspace_schema}\".users CASCADE")
     end
 
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index 7afd0ed64..a64e4b4bf 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -32,6 +32,8 @@
     "Message",
     "Oauth2Application",
     "Report",
+    "Team",
+    "TeamUser",
     "User",
     "UserBlock",
     "UserMute",