diff --git a/app/Http/Controllers/Admin/CreateNewContent.php b/app/Http/Controllers/Admin/CreateNewContent.php
index 1beee33b..bb7fd2f9 100644
--- a/app/Http/Controllers/Admin/CreateNewContent.php
+++ b/app/Http/Controllers/Admin/CreateNewContent.php
@@ -116,7 +116,9 @@ class CreateNewContent extends Controller
         }
 
         // upload file - if provided
-        $page->uploadTitlePhoto($request);
+        $file = $page->uploadTitlePhoto($request);
+
+        $page->title_photo = $file ? $file['filename'] : null;
 
         // save module-specific stuff
         call_user_func_array([$module->handler, 'createNew'], [&$page, $request]);
diff --git a/app/Http/Controllers/Admin/EditContent.php b/app/Http/Controllers/Admin/EditContent.php
index cae69a9a..f9122625 100644
--- a/app/Http/Controllers/Admin/EditContent.php
+++ b/app/Http/Controllers/Admin/EditContent.php
@@ -118,12 +118,14 @@ class EditContent extends Controller
                 ->with('error', trans('admin/contents.invalidPage'));
         }
 
+        // upload file - if provided
+        $file = $page->uploadTitlePhoto($request);
+
         $request->url = Str::slug($request->url);
         $request->parentPage = $request->parentPage ? $request->parentPage : null;
-        $request->titlePhotoFilename = $page->title_photo;
 
-        // upload file - if provided
-        $page->uploadTitlePhoto($request);
+        $request->titlePhotoFilename = $file ? $file['filename'] : null;
+
 
         // array of fields in database and fields from request
         $fields = [
@@ -142,7 +144,8 @@ class EditContent extends Controller
         ];
 
         // save new values with history
-        $data = self::getFields($request, $fields);
+        $data = self::getFields($request, array_values($fields));
+
         list($revision, $changedColumns) = $page->updateWithHistory($fields, $data);
 
         $changedColumns += call_user_func_array([$page->module_handler, 'edit'], [&$page, $request, $revision]);
diff --git a/app/Models/Content.php b/app/Models/Content.php
index 8d13ee10..3f54c64f 100644
--- a/app/Models/Content.php
+++ b/app/Models/Content.php
@@ -293,10 +293,10 @@ class Content extends Model
     public function uploadTitlePhoto(Request $request)
     {
         if ($request->hasFile('titlePhoto')) {
-            $file = $this->file->upload($request->file('titlePhoto'), $request);
-
-            $this->title_photo = $file['filename'];
+            return $this->file->upload($request->file('titlePhoto'), $request);
         }
+
+        return null;
     }
 
     /**