diff --git a/src/Sql/dbo/Stored Procedures/Cipher_DeleteByUserId.sql b/src/Sql/dbo/Stored Procedures/Cipher_DeleteByUserId.sql
index 2718234562..f10052cb64 100644
--- a/src/Sql/dbo/Stored Procedures/Cipher_DeleteByUserId.sql	
+++ b/src/Sql/dbo/Stored Procedures/Cipher_DeleteByUserId.sql	
@@ -22,6 +22,13 @@ BEGIN
         COMMIT TRANSACTION Cipher_DeleteByUserId_Ciphers
     END
 
+    -- Delete folders
+    DELETE
+    FROM
+        [dbo].[Folder]
+    WHERE
+        [UserId] = @UserId
+
     -- Cleanup user
     EXEC [dbo].[User_UpdateStorage] @UserId
     EXEC [dbo].[User_BumpAccountRevisionDate] @UserId