diff --git a/src/Sql/dbo/Stored Procedures/User_DeleteById.sql b/src/Sql/dbo/Stored Procedures/User_DeleteById.sql
index d3e83f7fa1..5176bde68a 100644
--- a/src/Sql/dbo/Stored Procedures/User_DeleteById.sql	
+++ b/src/Sql/dbo/Stored Procedures/User_DeleteById.sql	
@@ -3,10 +3,10 @@
 AS
 BEGIN
     SET NOCOUNT ON
+    DECLARE @BatchSize INT = 100
 
     BEGIN TRANSACTION User_DeleteById
 
-    DECLARE @BatchSize INT = 100
     WHILE @BatchSize > 0
     BEGIN
         DELETE TOP(@BatchSize)
@@ -14,10 +14,18 @@ BEGIN
             [dbo].[Cipher]
         WHERE
             [UserId] = @Id
+            AND [Type] > 0
 
         SET @BatchSize = @@ROWCOUNT
     END
 
+    DELETE
+    FROM
+        [dbo].[Cipher]
+    WHERE
+        [UserId] = @Id
+        AND [Type] = 0
+
     DELETE
     FROM
         [dbo].[Device]