diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 3703cc2d5a..a8ad057b93 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -686,6 +686,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
     @Override
     public void onDestroyView() {
+        mCameraLiveNoticeHelper.release();
         super.onDestroyView();
         isClickShare = false;
         TopViewAnimHelper.getInstance().removeAllView();
@@ -694,7 +695,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         TopViewNoLinkageAnimHelper.getInstance().clear();
         NoMapTopViewShaderHelper.getInstance().release();
         EntranceViewHolder.getInstance().release();
-        mCameraLiveNoticeHelper.release();
     }
 
     @Override
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
index 36c04a5a06..b547254d00 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
@@ -62,6 +62,7 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
     public void release() {
         MogoApisHandler.getInstance().getApis().getWebSocketManagerApi(mContext).unregisterOnWebSocketMessageListener(this);
         mCloudRoadData = null;
+        mContext = null;
     }
 
     public void enterVrMode() {
diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
index 9940ca26a2..3dedbf1cdc 100644
--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
@@ -169,11 +169,13 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements
 
     @Override
     public void onDestroyView() {
-        super.onDestroyView();
+        MapBroadCastHelper.getInstance( getContext() ).release();
         if ( mMogoMapView != null ) {
             mMogoMapView.onDestroy();
+            mMogoMapView = null;
+            mMogoMap = null;
         }
-        MapBroadCastHelper.getInstance( getContext() ).release();
         destroy();
+        super.onDestroyView();
     }
 }
diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragmentProvider.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragmentProvider.java
index c817646cc3..ef06792e0b 100644
--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragmentProvider.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragmentProvider.java
@@ -91,4 +91,9 @@ public class MapFragmentProvider implements IMogoModuleProvider {
     public String getAppName() {
         return null;
     }
+
+    @Override
+    public void onDestroy() {
+        mMapFragment = null;
+    }
 }