diff --git a/src/components/ClassView/MarkAttendanceButton.js b/src/components/ClassView/MarkAttendanceButton.js
index 4e4ec17..18358e2 100644
--- a/src/components/ClassView/MarkAttendanceButton.js
+++ b/src/components/ClassView/MarkAttendanceButton.js
@@ -5,7 +5,7 @@ import markAttendance from '../../backend/markAttendance';
 import {showMessage} from 'react-native-flash-message';
 import DidContext from '../../contexts/DidContext';
 
-const MarkAttendanceButton = ({ClassData}) => {
+const MarkAttendanceButton = ({ClassData, onSuccessMark}) => {
   const did = useContext(DidContext);
   const [markingAttendance, setMarkingAttendance] = useState(false);
 
@@ -25,6 +25,7 @@ const MarkAttendanceButton = ({ClassData}) => {
             floating: true,
             duration: 4000,
           });
+          onSuccessMark();
         })
         .catch(err => {
           setMarkingAttendance(false);
diff --git a/src/screens/CurrentClassScreen/CurrentClassScreen.tsx b/src/screens/CurrentClassScreen/CurrentClassScreen.tsx
index 7023727..15b7d1c 100755
--- a/src/screens/CurrentClassScreen/CurrentClassScreen.tsx
+++ b/src/screens/CurrentClassScreen/CurrentClassScreen.tsx
@@ -14,14 +14,21 @@ const CurrentClassScreen = () => {
   const {userName, userEmail} = useContext(UserContext);
 
   useEffect(() => {
+    fetchClass();
+  }, []);
+
+  function fetchClass() {
     fetchCurrentClass(did)
       .then(classs => {
         setCurrentClass(classs);
       })
-      .catch(err => {
-        // console.error(err);
-      });
-  }, []);
+      .catch(err => {});
+  }
+
+  function onSuccessMark() {
+    setCurrentClass(null);
+    fetchClass();
+  }
   return (
     <View>
       <StatusBar animated={true} backgroundColor="#1a1a1a" />
@@ -43,7 +50,10 @@ const CurrentClassScreen = () => {
 
         {/* Class Display */}
         <ClassView ClassData={currentClass} />
-        <MarkAttendanceButton ClassData={currentClass} />
+        <MarkAttendanceButton
+          ClassData={currentClass}
+          onSuccessMark={onSuccessMark}
+        />
       </LinearGradient>
     </View>
   );