diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx
index f8c073d..c9e4c54 100644
--- a/src/pages/Home.tsx
+++ b/src/pages/Home.tsx
@@ -139,6 +139,11 @@ const Home: React.FC = () => {
                 setError('Geolocation not active! Try searching for a city instead');
             }
         );
+
+        return () => {
+            setError('');
+            setLoading(true);
+        }
         // eslint-disable-next-line
     }, []);
 
diff --git a/src/pages/Search.tsx b/src/pages/Search.tsx
index 918c7de..7e7978e 100644
--- a/src/pages/Search.tsx
+++ b/src/pages/Search.tsx
@@ -133,6 +133,11 @@ const Search: React.FC = () => {
                 setError('No weather data found! Try again later');
             }
         })();
+
+        return () => {
+            setError('');
+            setLoading(true);
+        }
     }, [query]);
 
     return !loading ? (