diff --git a/src/components/ToolBar/ToolBar.jsx b/src/components/ToolBar/ToolBar.jsx
index 8bfb46b..4461da7 100644
--- a/src/components/ToolBar/ToolBar.jsx
+++ b/src/components/ToolBar/ToolBar.jsx
@@ -1,19 +1,14 @@
 import styles from "./ToolBar.module.css"
-import { useContext } from "react";
 import CreateEventBtn from "./tools/createEventBtn/CreateEventBtn.jsx";
-import { AuthContext } from "../../contexts/auth/AuthContext.js";
 import SearchBtn from "./tools/SearchBtn.tsx";
 import FilterBtn from "./tools/FilterBtn.tsx";
 
 function ToolBar({setFilters, filters, showCreate = true}) {
-    const { user } = useContext(AuthContext);
 
     return (
         <div>
             <div className={styles.eventsButtons}>
-                {showCreate && user.isAdmin ? (
-                    <CreateEventBtn />
-                ) : null}
+                {showCreate && <CreateEventBtn />}
                 <SearchBtn />
                 <FilterBtn setFilters={setFilters} filters={filters} />
             </div>
diff --git a/src/components/ToolBar/tools/createEventBtn/CreateEventBtn.jsx b/src/components/ToolBar/tools/createEventBtn/CreateEventBtn.jsx
index e7e886f..11b96d6 100644
--- a/src/components/ToolBar/tools/createEventBtn/CreateEventBtn.jsx
+++ b/src/components/ToolBar/tools/createEventBtn/CreateEventBtn.jsx
@@ -4,11 +4,13 @@ import Modal from "../../../ui/modal/modal.tsx";
 import Button from "../../../ui/button/button.tsx";
 import TextInput from "../../../ui/input/input.tsx";
 import { EventContext } from "../../../../contexts/events/EventContext.js";
+import {AuthContext} from "../../../../contexts/auth/AuthContext.ts";
 
 
 export default function CreateEventBtn() {
 
     const { addEvent } = useContext(EventContext);
+    const { user } = useContext(AuthContext);
 
     const [isOpen, setIsOpen] = useState(false);
     const [name, setName] = useState("");
@@ -24,6 +26,8 @@ export default function CreateEventBtn() {
         setIsOpen(false);
     }
 
+    if(!user.isAdmin) return null;
+
     return <>
         <Button className={`${styles.createButton} glassCard`} variant={"default"} onClick={() => setIsOpen(true)}> + </Button>