diff --git a/apps/terminal/models/terminal.py b/apps/terminal/models/terminal.py
index 0c0c36771..77c9b1ce8 100644
--- a/apps/terminal/models/terminal.py
+++ b/apps/terminal/models/terminal.py
@@ -176,12 +176,6 @@ class Terminal(StorageMixin, TerminalStatusMixin, models.Model):
         self.save()
         return
 
-    def save(self, **kwargs):
-        from .storage import CommandStorage, ReplayStorage
-        self.command_storage = CommandStorage.default().name
-        self.replay_storage = ReplayStorage.default().name
-        return super().save(**kwargs)
-
     def __str__(self):
         status = "Active"
         if not self.is_accepted:
diff --git a/apps/terminal/serializers/terminal.py b/apps/terminal/serializers/terminal.py
index e4640e454..44cb2a3a5 100644
--- a/apps/terminal/serializers/terminal.py
+++ b/apps/terminal/serializers/terminal.py
@@ -119,5 +119,7 @@ class TerminalRegistrationSerializer(serializers.ModelSerializer):
             instance.remote_addr = get_request_ip(request)
         sa = self.service_account.save()
         instance.user = sa
+        instance.command_storage = CommandStorage.default().name
+        instance.replay_storage = ReplayStorage.default().name
         instance.save()
         return instance