2 files changed, 5 insertions, 1 deletions
diff --git a/modern/src/reports/ReportLayoutPage.js b/modern/src/reports/ReportLayoutPage.js
index fafffc72..6bab67c6 100644
--- a/modern/src/reports/ReportLayoutPage.js
+++ b/modern/src/reports/ReportLayoutPage.js
@@ -75,7 +75,7 @@ const ReportLayoutPage = ({ children, filter, }) => {
           break;
       }
     });
-  }, []);
+  }, [location]);
 
   return (
     <div className={classes.root}>
diff --git a/modern/src/settings/MaintenancePage.js b/modern/src/settings/MaintenancePage.js
index 9263ee30..3b4fde54 100644
--- a/modern/src/settings/MaintenancePage.js
+++ b/modern/src/settings/MaintenancePage.js
@@ -64,6 +64,8 @@ const MaintenancePage = () => {
           return speedFromKnots(value, speedUnit);
         case 'distance':
           return distanceFromMeters(value, distanceUnit);
+        default:
+          return value;
       }
     }
     return value;
@@ -78,6 +80,8 @@ const MaintenancePage = () => {
           return speedToKnots(value, speedUnit);
         case 'distance':
           return distanceToMeters(value, distanceUnit);
+        default:
+          return value;
       }
     }
     return value;