diff --git a/core/viewsets.py b/core/viewsets.py
index ca6ff0d2..78b91faa 100644
--- a/core/viewsets.py
+++ b/core/viewsets.py
@@ -806,7 +806,10 @@ class OrderViewSet(EvibesViewSet):
     def current(self, request):
         if not request.user.is_authenticated:
             raise PermissionDenied(permission_denied_message)
-        order = Order.objects.get(user=request.user, status="PENDING")
+        try:
+            order = Order.objects.get(user=request.user, status="PENDING")
+        except Order.DoesNotExist:
+            order = Order.objects.create(user=request.user)
         return Response(
             status=status.HTTP_200_OK,
             data=OrderDetailSerializer(order).data,