diff --git a/search-engine/src/component/search.js b/search-engine/src/component/search.js
index 2e9b8f2a254d396751863acf3c74d035c1881b05..e7203bbd0a326629c47be469e437f16d40532c73 100644
--- a/search-engine/src/component/search.js
+++ b/search-engine/src/component/search.js
@@ -41,6 +41,7 @@ let SearchEngine = function () {
     const [isLoading, setIsLoading] = useState(false);
     const [prevPage, setPrevPage] = useState(0);
     const [maxPage, setMaxPage] = useState(0);
+    const [submitted, setSubmitted] = useState(false)
 
 
     const parseESData = (data) => {
@@ -66,6 +67,11 @@ let SearchEngine = function () {
     const handleSubmit = (e) => {
         e.preventDefault();
         setIsLoading(true)
+        setMaxPage(0)
+        setPrevPage(0)
+        console.log(e)
+        setSubmitted(true)
+        //e.component.pageIndex(0)
         let query = e.target[0].value
         search(query).then((res) => {
             let parsedRes = parseESData(res.data)
@@ -79,6 +85,11 @@ let SearchEngine = function () {
     }
 
     const handlePageChange = (e) => {
+        
+        if (submitted) {
+            e.component.pageIndex(0)
+            setSubmitted(false)
+        }
         let curPage = e.component.pageIndex()
 
         if (curPage < prevPage){