diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index 34c5b9fb..d2667d11 100644
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -408,7 +408,10 @@ class ItemController extends Controller
         $app = $single->class;
 
         // If password is not resubmitted fill it from the database when in edit mode
-        if ($data['password'] === null && array_key_exists('id', $data)) {
+        if (array_key_exists('password', $data) &&
+            $data['password'] === null &&
+            array_key_exists('id', $data)
+        ) {
             $item = Item::find($data['id']);
             if ($item) {
                 $itemConfig = $item->getConfig();