diff --git a/Providers/XFileProvider.cs b/Providers/XFileProvider.cs
index edb9938..2533d4c 100644
--- a/Providers/XFileProvider.cs
+++ b/Providers/XFileProvider.cs
@@ -807,6 +807,7 @@ namespace xFileService.Providers
                     try
                     {
                         //
+                        // Removed Stored Thumbnail ...
                         StorageProvider.DeleteFile(
                            fileFullPath: thumbFullPath,
                            forceFileExists: false
@@ -823,10 +824,20 @@ namespace xFileService.Providers
                     try
                     {
                         //
+                        // Remove Stored File ...
                         StorageProvider.DeleteFile(
                             fileFullPath: fileFullPath,
                             forceFileExists: false
                         );
+
+
+                        //
+                        // Remove Tags ...
+                        await DetachTags(
+                            id: id,
+                            userInfo: userInfo,
+                            connectionId: connectionId
+                        );
                     }
                     catch { }
                 }
@@ -844,24 +855,6 @@ namespace xFileService.Providers
                 );
             }
 
-            //
-            // Remove Tags ...
-            if (!result.IsNull() && result.HasChild())
-            {
-                //
-                foreach (var id in result)
-                {
-                    //
-                    // Here we send Null Connection ID for Preventing Update Push ...
-                    // since we Remove Entity ...
-                    await DetachTags(
-                        id: id,
-                        userInfo: userInfo,
-                        connectionId: null
-                    );
-                }
-            }
-
             //
             return result;
         }