diff --git a/lib/redux/fireMapActions.dart b/lib/redux/fireMapActions.dart
index eebbf56..3ed8d14 100644
--- a/lib/redux/fireMapActions.dart
+++ b/lib/redux/fireMapActions.dart
@@ -36,12 +36,6 @@ class EditYourLocationAction extends FiresMapActions {
   EditYourLocationAction(this.loc);
 }
 
-class EditingYourLocationAction extends FiresMapActions {
-  YourLocation loc;
-
-  EditingYourLocationAction(this.loc);
-}
-
 class EditConfirmYourLocationAction extends FiresMapActions{
   YourLocation loc;
 
diff --git a/lib/redux/fireMapReducer.dart b/lib/redux/fireMapReducer.dart
index e1a58d4..f1cd89d 100644
--- a/lib/redux/fireMapReducer.dart
+++ b/lib/redux/fireMapReducer.dart
@@ -16,8 +16,6 @@ final fireMapReducer = combineReducers<FireMapState>([
   new TypedReducer<FireMapState, EditYourLocationAction>(_editYourLocationMap),
   new TypedReducer<FireMapState, EditConfirmYourLocationAction>(
       _editConfirmYourLocationMap),
-  new TypedReducer<FireMapState, EditingYourLocationAction>(
-      _editingYourLocationMap),
   new TypedReducer<FireMapState, EditCancelYourLocationAction>(
       _editCancelYourLocationMap),
   new TypedReducer<FireMapState, UpdateYourLocationMapAction>(
@@ -54,12 +52,12 @@ FireMapState _subscribeYourLocationMap(
 
 FireMapState _subscribeConfirmYourLocationMap(
     FireMapState state, SubscribeConfirmAction action) {
-  return state.copyWith(status: FireMapStatus.unsubscribe);
+  return state.copyWith(status: FireMapStatus.unsubscribe, yourLocation: action.loc);
 }
 
 FireMapState _unsubscribeYourLocationMap(
     FireMapState state, UnSubscribeAction action) {
-  return state.copyWith(status: FireMapStatus.view);
+  return state.copyWith(status: FireMapStatus.view, yourLocation: action.loc);
 }
 
 FireMapState _editYourLocationMap(
@@ -67,11 +65,6 @@ FireMapState _editYourLocationMap(
   return state.copyWith(status: FireMapStatus.edit);
 }
 
-FireMapState _editingYourLocationMap(
-    FireMapState state, EditingYourLocationAction action) {
-  return state.copyWith(yourLocation: action.loc);
-}
-
 FireMapState _editConfirmYourLocationMap(
     FireMapState state, EditConfirmYourLocationAction action) {
   return state.copyWith(status: restoreStatusAfterSave(action.loc));
diff --git a/lib/yourLocationMap.dart b/lib/yourLocationMap.dart
index 1d37f05..2fddbed 100644
--- a/lib/yourLocationMap.dart
+++ b/lib/yourLocationMap.dart
@@ -259,7 +259,9 @@ class _YourLocationMapState extends State<YourLocationMap> {
                               // Fit sample:
                               // https://github.com/apptreesoftware/flutter_map/blob/master/flutter_map_example/lib/pages/map_controller.dart
                               children:
-                                  status == FireMapStatus.subscriptionConfirm
+                                  status == FireMapStatus.subscriptionConfirm ||
+                                          (status == FireMapStatus.edit &&
+                                              _location.subscribed)
                                       ? <Widget>[
                                           new FireDistanceSlider(
                                               initialValue: _location.distance,