diff --git a/apps/authentication/api/connection_token.py b/apps/authentication/api/connection_token.py
index 7add2d804..a86ce8b8d 100644
--- a/apps/authentication/api/connection_token.py
+++ b/apps/authentication/api/connection_token.py
@@ -141,8 +141,8 @@ class UserConnectionTokenViewSet(RootOrgViewMixin, SerializerMixin2, GenericView
         token = self.create_token(user, asset, application, system_user)
 
         # Todo: 上线后地址是 JumpServerAddr:3389
-        address = settings.RDP_ADDR
-        if address == 'localhost:3389':
+        address = settings.TERMINAL_RDP_ADDR
+        if not address or address == 'localhost:3389':
             address = request.get_host().split(':')[0] + ':3389'
         options['full address:s'] = address
         options['username:s'] = '{}|{}'.format(user.username, token)
diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py
index f3b59d2d9..89b790929 100644
--- a/apps/jumpserver/conf.py
+++ b/apps/jumpserver/conf.py
@@ -302,7 +302,7 @@ class Config(dict):
         'FORGOT_PASSWORD_URL': '',
         'HEALTH_CHECK_TOKEN': '',
 
-        'RDP_ADDR': 'localhost:3389'
+        'TERMINAL_RDP_ADDR': ''
     }
 
     def compatible_auth_openid_of_key(self):
diff --git a/apps/jumpserver/settings/custom.py b/apps/jumpserver/settings/custom.py
index d68195792..ae965d343 100644
--- a/apps/jumpserver/settings/custom.py
+++ b/apps/jumpserver/settings/custom.py
@@ -126,4 +126,4 @@ FORGOT_PASSWORD_URL = CONFIG.FORGOT_PASSWORD_URL
 GLOBAL_ORG_DISPLAY_NAME = CONFIG.GLOBAL_ORG_DISPLAY_NAME
 HEALTH_CHECK_TOKEN = CONFIG.HEALTH_CHECK_TOKEN
 
-RDP_ADDR = CONFIG.RDP_ADDR
+TERMINAL_RDP_ADDR = CONFIG.TERMINAL_RDP_ADDR
diff --git a/apps/settings/serializers/settings.py b/apps/settings/serializers/settings.py
index a997c5466..99bdc8c09 100644
--- a/apps/settings/serializers/settings.py
+++ b/apps/settings/serializers/settings.py
@@ -15,11 +15,7 @@ class BasicSettingSerializer(serializers.Serializer):
         required=True, label=_("Site url"),
         help_text=_('eg: http://dev.jumpserver.org:8080')
     )
-    RDP_ADDR = serializers.CharField(
-        required=True, label=_("RDP address"),
-        max_length=1024,
-        help_text=_('RDP visit address, eg: dev.jumpserver.org:3389')
-    )
+
     USER_GUIDE_URL = serializers.URLField(
         required=False, allow_blank=True, allow_null=True, label=_("User guide url"),
         help_text=_('User first login update profile done redirect to it')
@@ -138,6 +134,11 @@ class TerminalSettingSerializer(serializers.Serializer):
         help_text=_('Units: days, Session, record, command will be delete if more than duration, only in database')
     )
     TERMINAL_TELNET_REGEX = serializers.CharField(allow_blank=True, max_length=1024, required=False, label=_('Telnet login regex'))
+    TERMINAL_RDP_ADDR = serializers.CharField(
+        required=False, label=_("RDP address"),
+        max_length=1024,
+        help_text=_('RDP visit address, eg: dev.jumpserver.org:3389')
+    )
 
 
 class SecuritySettingSerializer(serializers.Serializer):