diff --git a/app/Http/Controllers/Api/ServicesController.php b/app/Http/Controllers/Api/ServicesController.php
index c3730d83f..e792779e1 100644
--- a/app/Http/Controllers/Api/ServicesController.php
+++ b/app/Http/Controllers/Api/ServicesController.php
@@ -380,6 +380,9 @@ class ServicesController extends Controller
 
             $service = new Service;
             $result = $this->upsert_service($request, $service, $teamId);
+            if ($result instanceof \Illuminate\Http\JsonResponse) {
+                return $result;
+            }
 
             return response()->json(serializeApiResponse($result))->setStatusCode(201);
         } else {
@@ -608,12 +611,14 @@ class ServicesController extends Controller
         }
 
         $service = Service::whereRelation('environment.project.team', 'id', $teamId)->whereUuid($request->uuid)->first();
-
         if (! $service) {
             return response()->json(['message' => 'Service not found.'], 404);
         }
 
         $result = $this->upsert_service($request, $service, $teamId);
+        if ($result instanceof \Illuminate\Http\JsonResponse) {
+            return $result;
+        }
 
         return response()->json(serializeApiResponse($result))->setStatusCode(200);
     }