diff --git a/apps/pos_device/pos/api/v1/viewsets/device.py b/apps/pos_device/pos/api/v1/viewsets/device.py
index 329a340..871d762 100644
--- a/apps/pos_device/pos/api/v1/viewsets/device.py
+++ b/apps/pos_device/pos/api/v1/viewsets/device.py
@@ -59,7 +59,7 @@ class POSDeviceViewSet(viewsets.ModelViewSet, POSDeviceMixin):
 
         # activate device
         if device:
-            if not device.is_activated or not device.pre_registered:
+            if not device.is_activated or not device.pre_registered and device.assigned_state is True:
                 device.is_activated = True
                 device.save()