diff --git a/src/Pages/Advertisement/AdvertisementAdmin.js b/src/Pages/Advertisement/AdvertisementAdmin.js
index 854c5b4d8..6116c91c0 100644
--- a/src/Pages/Advertisement/AdvertisementAdmin.js
+++ b/src/Pages/Advertisement/AdvertisementAdmin.js
@@ -8,9 +8,7 @@ export default function AdvertisementAdmin() {
 
   const [ads, setAds] = useState([]);
   const [message, setMessage] = useState('');
-  const [year, setYear] = useState();
-  const [month, setMonth] = useState();
-  const [day, setDay] = useState();
+  const [date, setDate] = useState('');
 
   async function getAdsFromDB() {
     const adsFromDB = await getAds(user.token);
@@ -21,21 +19,11 @@ export default function AdvertisementAdmin() {
 
   async function createAdHandler() {
     // make sure empty inputs are properly set as undefined if empty
-    if (year === '') {
-      setYear(undefined);
-    }
-    if (month === '') {
-      setMonth(undefined);
-    }
-    if (day === '') {
-      setDay(undefined);
-    }
 
-    let expireDate = new Date(year, month - 1, day);
+    let expireDate = date ? new Date(date) : undefined;
     if (isNaN(expireDate.getTime())) {
       expireDate = undefined;
     }
-
     await createAd({
       message,
       expireDate,
@@ -103,26 +91,9 @@ export default function AdvertisementAdmin() {
         <div className="flex items-center space-x-4 mb-6">
           <input
             className="flex-1 text-sm input input-bordered sm:text-base"
-            type="text"
-            placeholder="Year"
-            onChange={event => {
-              setYear(event.target.value);
-            }}
-          />
-          <input
-            className="flex-1 text-sm input input-bordered sm:text-base"
-            type="text"
-            placeholder="Month"
-            onChange={event => {
-              setMonth(event.target.value);
-            }}
-          />
-          <input
-            className="flex-1 text-sm input input-bordered sm:text-base"
-            type="text"
-            placeholder="Day"
+            type="date"
             onChange={event => {
-              setDay(event.target.value);
+              setDate(event.target.value);
             }}
           />
           <button