diff --git a/src/Domain/Items/Controllers/RenameFileOrFolderController.php b/src/Domain/Items/Controllers/RenameFileOrFolderController.php
index 5f09df87..36c408a3 100644
--- a/src/Domain/Items/Controllers/RenameFileOrFolderController.php
+++ b/src/Domain/Items/Controllers/RenameFileOrFolderController.php
@@ -2,7 +2,9 @@
 namespace Domain\Items\Controllers;
 
 use App\Http\Controllers\Controller;
+use Domain\Files\Models\File;
 use Domain\Files\Resources\FileResource;
+use Domain\Folders\Models\Folder;
 use Domain\Folders\Resources\FolderResource;
 use Domain\Items\Requests\RenameItemRequest;
 use Domain\Items\Actions\RenameFileOrFolderAction;
@@ -27,9 +29,15 @@ class RenameFileOrFolderController extends Controller
     public function __invoke(
         RenameItemRequest $request,
         string $id,
-    ): FileResource | FolderResource | array {
+    ): FileResource | FolderResource | File | Folder | array {
         if (is_demo_account()) {
-            return ($this->fakeRenameFileOrFolder)($request, $id);
+            $item = ($this->fakeRenameFileOrFolder)($request, $id);
+
+            if ($request->input('type') === 'folder') {
+                return new FolderResource($item);
+            }
+
+            return new FileResource($item);
         }
 
         // If request contain icon or color, then change it
diff --git a/src/Support/Demo/Actions/FakeRenameFileOrFolderAction.php b/src/Support/Demo/Actions/FakeRenameFileOrFolderAction.php
index a9205717..52b99508 100644
--- a/src/Support/Demo/Actions/FakeRenameFileOrFolderAction.php
+++ b/src/Support/Demo/Actions/FakeRenameFileOrFolderAction.php
@@ -13,7 +13,7 @@ class FakeRenameFileOrFolderAction
     public function __invoke(
         RenameItemRequest $request,
         string $id,
-    ): array {
+    ): array|File|Folder {
         // Get item
         if ($request->input('type') === 'folder') {
             $item = Folder::where('id', $id)
@@ -25,8 +25,10 @@ class FakeRenameFileOrFolderAction
 
         if ($item) {
             $item->name = $request->input('name');
-            $item->emoji = $request->input('icon.emoji') ?? null;
-            $item->color = $request->input('icon.color') ?? null;
+
+            if ($request->has('emoji')) {
+                $item->emoji = $request->input('emoji');
+            }
 
             return $item;
         }