diff --git a/apps/assets/api/domain.py b/apps/assets/api/domain.py
index c2cf0da65..7ccaa6dcb 100644
--- a/apps/assets/api/domain.py
+++ b/apps/assets/api/domain.py
@@ -3,10 +3,10 @@ from django.utils.translation import ugettext as _
 from django.views.generic.detail import SingleObjectMixin
 from rest_framework.serializers import ValidationError
 from rest_framework.views import APIView, Response
-
 from common.utils import get_logger
 from assets.tasks import test_gateways_connectivity_manual
 from orgs.mixins.api import OrgBulkModelViewSet
+from .asset import AssetViewSet
 from .. import serializers
 from ..models import Domain, Gateway
 
@@ -28,7 +28,7 @@ class DomainViewSet(OrgBulkModelViewSet):
         return super().get_serializer_class()
 
 
-class GatewayViewSet(OrgBulkModelViewSet):
+class GatewayViewSet(AssetViewSet):
     perm_model = Gateway
     filterset_fields = ("domain__name", "name", "domain")
     search_fields = ("domain__name",)
diff --git a/apps/assets/serializers/gateway.py b/apps/assets/serializers/gateway.py
index 012348719..78d8afda5 100644
--- a/apps/assets/serializers/gateway.py
+++ b/apps/assets/serializers/gateway.py
@@ -20,9 +20,7 @@ class GatewaySerializer(HostSerializer):
             queryset = queryset.exclude(id=self.instance.id)
         has = queryset.exists()
         if has:
-            raise serializers.ValidationError(
-                _('This field must be unique.')
-            )
+            raise serializers.ValidationError(_('This field must be unique.'))
         return value