diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index ae957f61..a9619285 100644
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -54,7 +54,7 @@ class ItemController extends Controller
             } );
         }
 
-        $Items = $Items->orderByDesc( 'id' )->paginate( 10 );
+        $Items = $Items->isNotRepaired()->orderByDesc( 'id' )->paginate( 10 );
 
         return ItemResource::collection( $Items );
     }
diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php
index 360b1b97..e63dbabb 100644
--- a/app/Http/Controllers/PackageController.php
+++ b/app/Http/Controllers/PackageController.php
@@ -173,13 +173,10 @@ class PackageController extends Controller
             return MessageResponse::error( trans( 'messages.access_denied' ) );
         }
         if ( count( $Package->items ) ) {
-            foreach ( $Package->items as $itemId ) {
-                $item = Item::where( "id" , $itemId )->first();
-                if ( $item ) {
-                    $item->update( [
-                        "package_id" => null
-                    ] );
-                }
+            foreach ( $Package->items as $item ) {
+                $item->update( [
+                    "package_id" => null
+                ] );
             }
         }
         if ( count( $Package->labels ) ) {
diff --git a/app/Item.php b/app/Item.php
index a73f44ea..746006fa 100644
--- a/app/Item.php
+++ b/app/Item.php
@@ -14,6 +14,11 @@ class Item extends Model implements HasMedia
 
     public $fillable = [ 'name' , 'size' , 'unique_id' , 'specific' , 'note' , 'user_id' , 'udi' , 'status' , 'repair' , 'package_id' , 'creator_id' ];
 
+    public function scopeIsNotRepaired($query)
+    {
+        return $query->where( 'repair' , 0 );
+    }
+
     public function package()
     {
         return $this->belongsTo( 'App\Package' );