diff --git a/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
index 7c4be2d7..56e6e43e 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
@@ -762,7 +762,7 @@ public class MediaServerServiceImpl implements IMediaServerService {
             calld = streamAuthorityInfo.getCallId();
         }
         List<StreamInfo> streamInfoList = getMediaList(mediaInfo, app, stream, calld);
-        if (streamInfoList.isEmpty()) {
+        if (streamInfoList == null || streamInfoList.isEmpty()) {
             return null;
         }else {
             return streamInfoList.get(0);
diff --git a/src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyServiceImpl.java
index 6e9c46a4..6d22e53c 100755
--- a/src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyServiceImpl.java
@@ -216,9 +216,10 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
         // 判断是否需要重启代理
         if (!streamProxyInDb.getApp().equals(streamProxy.getApp())
                 || !streamProxyInDb.getStream().equals(streamProxy.getStream())
-                || !streamProxyInDb.getMediaServerId().equals(streamProxy.getMediaServerId())
+                || (streamProxyInDb.getMediaServerId() != null && streamProxyInDb.getMediaServerId().equals(streamProxy.getMediaServerId()))
+                || (streamProxyInDb.getMediaServerId() == null && streamProxy.getMediaServerId() != null)
         ) {
-            // app/stream 变化则重启代理
+            // 变化则重启代理
             stopProxy(streamProxyInDb);
             startProxy(streamProxy);
         }
diff --git a/web_src/src/components/StreamProxyEdit.vue b/web_src/src/components/StreamProxyEdit.vue
index bf9877c7..e994bdf9 100644
--- a/web_src/src/components/StreamProxyEdit.vue
+++ b/web_src/src/components/StreamProxyEdit.vue
@@ -152,6 +152,7 @@ export default {
         }).then((res)=> {
           if (typeof (res.data.code) != "undefined" && res.data.code === 0) {
             this.$message.success("保存成功");
+            this.locading = false;
             this.streamProxy = res.data.data
           }else {
             this.$message.error(res.data.msg);
@@ -169,6 +170,7 @@ export default {
         }).then((res)=> {
           if (typeof (res.data.code) != "undefined" && res.data.code === 0) {
             this.$message.success("保存成功");
+            this.locading = false;
             this.streamProxy = res.data.data
           }else {
             this.$message.error(res.data.msg);