diff --git a/frontend/src/features/day/Board/Board.error.tsx b/frontend/src/features/day/Board/Board.error.tsx
index 8f7955e..5e05586 100644
--- a/frontend/src/features/day/Board/Board.error.tsx
+++ b/frontend/src/features/day/Board/Board.error.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { useHistory } from 'react-router';
 import styled from 'styled-components/macro';
 import { Button, Icon } from '@binarycapsule/ui-capsules';
 import { AxiosError } from 'axios';
@@ -39,6 +40,8 @@ interface Props {
 
 // TODO ➜ Improve error handling
 export const BoardError: React.FC<Props> = ({ error }) => {
+  const history = useHistory();
+
   const status = error?.response?.status;
 
   return (
@@ -52,11 +55,9 @@ export const BoardError: React.FC<Props> = ({ error }) => {
         {status === 404 ? 'Day not found' : 'Oops, something went wrong...'}
       </ErrorText>
 
-      {status !== 404 && (
-        <Button appearance="minimal" iconBefore="refresh" onClick={document.location.reload}>
-          Refresh the page
-        </Button>
-      )}
+      <Button appearance="minimal" iconBefore="refresh" onClick={() => history.push('/day')}>
+        Refresh the page
+      </Button>
     </StyledBoardError>
   );
 };
diff --git a/frontend/src/features/day/api/useUpdateTask.ts b/frontend/src/features/day/api/useUpdateTask.ts
index d73597d..7883bbf 100644
--- a/frontend/src/features/day/api/useUpdateTask.ts
+++ b/frontend/src/features/day/api/useUpdateTask.ts
@@ -38,7 +38,7 @@ export const useUpdateTask = () => {
       queryCache.cancelQueries('activeTask');
 
       const previousDay = queryCache.getQueryData(['day', dayId]) as DayDto;
-      const previousActiveTask = queryCache.getQueryData('activeTask');
+      const previousActiveTask = queryCache.getQueryData('activeTask') as ActiveTaskDto;
       const scopes = queryCache.getQueryData('scopes') as ScopeDto[];
 
       queryCache.setQueryData<DayDto | undefined>(['day', dayId], currentDay => {
@@ -68,6 +68,13 @@ export const useUpdateTask = () => {
               queryCache.setQueryData('activeTask', emptyActiveTask);
             }
 
+            if (payload.title) {
+              queryCache.setQueryData('activeTask', {
+                ...previousActiveTask,
+                title: payload.title,
+              });
+            }
+
             return produce(currentDay, draftState => {
               const scope =
                 // eslint-disable-next-line no-nested-ternary