diff --git a/apps/common/api/mixin.py b/apps/common/api/mixin.py
index e8266d928..7db2056ac 100644
--- a/apps/common/api/mixin.py
+++ b/apps/common/api/mixin.py
@@ -214,3 +214,11 @@ class CommonApiMixin(
     def is_swagger_request(self):
         return getattr(self, 'swagger_fake_view', False) or \
             getattr(self, 'raw_action', '') == 'metadata'
+
+    def get_queryset(self):
+        queryset = super().get_queryset()
+
+        if 'name' in self.ordering_fields:
+            self.ordering = ('name',)
+
+        return queryset
diff --git a/apps/terminal/api/component/storage.py b/apps/terminal/api/component/storage.py
index 9f0b2a94f..a45d42df9 100644
--- a/apps/terminal/api/component/storage.py
+++ b/apps/terminal/api/component/storage.py
@@ -37,6 +37,7 @@ class BaseStorageViewSetMixin:
 
 class CommandStorageViewSet(BaseStorageViewSetMixin, viewsets.ModelViewSet):
     search_fields = ('name', 'type')
+    ordering = ('name',)
     queryset = CommandStorage.objects.all()
     serializer_class = CommandStorageSerializer
     filterset_class = CommandStorageFilter
@@ -114,6 +115,7 @@ class ReplayStorageFilterSet(BaseFilterSet):
 
 class ReplayStorageViewSet(BaseStorageViewSetMixin, viewsets.ModelViewSet):
     search_fields = ('name', 'type', 'is_default')
+    ordering = ('name',)
     queryset = ReplayStorage.objects.all()
     serializer_class = ReplayStorageSerializer
     filterset_class = ReplayStorageFilterSet