diff --git a/packages/bookshop/app/orders/fiori-service.cds b/packages/bookshop/app/orders/fiori-service.cds
index 513e0249..a504a022 100644
--- a/packages/bookshop/app/orders/fiori-service.cds
+++ b/packages/bookshop/app/orders/fiori-service.cds
@@ -21,6 +21,7 @@ annotate AdminService.OrderItems with {
 }
 
 
+@odata.draft.enabled
 annotate AdminService.Orders with @(
 	UI: {
 		////////////////////////////////////////////////////////////////////////////
diff --git a/packages/bookshop/srv/admin-service.cds b/packages/bookshop/srv/admin-service.cds
index e752a97b..befc3d9b 100644
--- a/packages/bookshop/srv/admin-service.cds
+++ b/packages/bookshop/srv/admin-service.cds
@@ -6,10 +6,6 @@ service AdminService @(_requires:'authenticated-user') {
   entity Orders as select from my.Orders;
 }
 
-// Enable Fiori Draft for Orders
-annotate AdminService.Orders with @odata.draft.enabled;
-// annotate AdminService.Books with @odata.draft.enabled;
-
 // Temporary workaround -> cap/issues#3121
 extend service AdminService with {
   entity OrderItems as select from my.OrderItems;