diff --git a/app/controllers/api/v0/shipments_controller.rb b/app/controllers/api/v0/shipments_controller.rb
index 48f15a225b..a6700e570e 100644
--- a/app/controllers/api/v0/shipments_controller.rb
+++ b/app/controllers/api/v0/shipments_controller.rb
@@ -44,14 +44,16 @@ module Api
 
       def ready
         authorize! :read, Spree::Shipment
-        unless @shipment.ready?
-          if @shipment.can_ready?
-            @shipment.ready!
-          else
-            render(json: { error: I18n.t(:cannot_ready, scope: "spree.api.shipment") },
-                   status: :unprocessable_entity) && return
-          end
+
+        unless @shipment.ready? || @shipment.can_ready?
+          return render(
+            json: { error: I18n.t(:cannot_ready, scope: "spree.api.shipment") },
+            status: :unprocessable_entity
+          )
         end
+
+        @shipment.ready!
+
         render json: @shipment, serializer: Api::ShipmentSerializer, status: :ok
       end