diff --git a/src/screens/AssemblyScreen/AssemblyView.tsx b/src/screens/AssemblyScreen/AssemblyView.tsx
index d5113bc..6f6601e 100644
--- a/src/screens/AssemblyScreen/AssemblyView.tsx
+++ b/src/screens/AssemblyScreen/AssemblyView.tsx
@@ -10,7 +10,7 @@ import OrderInfoView from "./OrderInfoView";
 import AssemblyControls from "./AssemblyControls";
 import AcceptAssemblyModal from "./AcceptAssemblyModal";
 import assemblyApi, {CreateAssemblyResponse} from "../../api/assemblyApi";
-import {setAssembly, startAssembly} from "../../features/assembly/assemblySlice";
+import {selectProduct, setAssembly, startAssembly} from "../../features/assembly/assemblySlice";
 
 type Props = {
     order: Order;
@@ -25,14 +25,23 @@ const AssemblyView = (props: Props) => {
             dispatch(startAssembly());
         })
     }
-
+    function getImageUrl() {
+        const productsImages = order.products.map(op=>op.imageUrl);
+        if (state.selectedProduct && productsImages.includes(state.selectedProduct.imageUrl)){
+            return state.selectedProduct.imageUrl;
+        }
+        if (order.products.length > 0) {
+            return order.products[0].imageUrl;
+        }
+        return "";
+    }
 
     return (
         <View style={styles.viewContainer}>
             <View style={styles.topSection}>
                 <AssemblyProductSelect order={order}/>
                 <ProductImageView
-                    imageUrl={state.selectedProduct ? state.selectedProduct.imageUrl : order.products[0].imageUrl}/>
+                    imageUrl={getImageUrl()}/>
             </View>
             <View style={styles.bottomSection}>
                 <OrderInfoView