diff --git a/00-backend/src/main/java/de/htwsaar/webshop/controller/FarmImageController.java b/00-backend/src/main/java/de/htwsaar/webshop/controller/FarmImageController.java
index eeedc90..1d02cc9 100644
--- a/00-backend/src/main/java/de/htwsaar/webshop/controller/FarmImageController.java
+++ b/00-backend/src/main/java/de/htwsaar/webshop/controller/FarmImageController.java
@@ -3,6 +3,7 @@ package de.htwsaar.webshop.controller;
 import de.htwsaar.webshop.model.ArticleWithFarmImageModel;
 import de.htwsaar.webshop.model.FarmImageModel;
 import de.htwsaar.webshop.repository.entities.FarmImage;
+import de.htwsaar.webshop.repository.entities.Image;
 import de.htwsaar.webshop.service.ArticleService;
 import de.htwsaar.webshop.service.FarmImageService;
 import jakarta.servlet.http.HttpServletRequest;
@@ -71,13 +72,17 @@ public class FarmImageController {
 
     @RequestMapping(path = FARM_IMAGE_BASE, method = RequestMethod.PUT, produces = "application/json")
     public ResponseEntity<Boolean> update(HttpServletRequest request,
-                                          @RequestParam(value = PARAM_ID) Long imageId,
-                                          @RequestBody FarmImageModel image) {
+                                          @RequestParam(value = PARAM_UUID) UUID uuid,
+                                          @RequestBody String base64) {
         logRequest(request);
-        if (imageId == null || farmImageService.getImageById(imageId) == null) {
+        FarmImage image = farmImageService.getImageByUUID(uuid);
+        if (uuid == null || base64 == null) {
             return ResponseEntity.badRequest().body(false);
         }
-        image.setId(farmImageService.getImageById(imageId).getId());
+        if (image == null) {
+            return ResponseEntity.ok(farmImageService.save(uuid, base64, false) != null);
+        }
+        image.setBase64(base64);
         return ResponseEntity.ok(farmImageService.save(image) != null);
     }
 
diff --git a/00-backend/src/main/java/de/htwsaar/webshop/controller/ImageController.java b/00-backend/src/main/java/de/htwsaar/webshop/controller/ImageController.java
index 422f900..f1f9538 100644
--- a/00-backend/src/main/java/de/htwsaar/webshop/controller/ImageController.java
+++ b/00-backend/src/main/java/de/htwsaar/webshop/controller/ImageController.java
@@ -74,13 +74,17 @@ public class ImageController {
 
     @RequestMapping(path = IMAGE_BASE, method = RequestMethod.PUT, produces = "application/json")
     public ResponseEntity<Boolean> update(HttpServletRequest request,
-                                          @RequestParam(value = PARAM_ID) Long imageId,
-                                          @RequestBody ImageModel image) {
+                                          @RequestParam(value = PARAM_UUID) UUID uuid,
+                                          @RequestBody String base64) {
         logRequest(request);
-        if (imageId == null || imageService.getImageById(imageId) == null) {
+        Image image = imageService.getImageByUUID(uuid);
+        if (uuid == null || base64 == null) {
             return ResponseEntity.badRequest().body(false);
         }
-        image.setId(imageService.getImageById(imageId).getId());
+        if (image == null) {
+            return ResponseEntity.ok(imageService.save(uuid, base64) != null);
+        }
+        image.setBase64(base64);
         return ResponseEntity.ok(imageService.save(image) != null);
     }