diff --git a/js/app.js b/js/app.js
index 29ac5c8..8741d70 100644
--- a/js/app.js
+++ b/js/app.js
@@ -84,7 +84,7 @@ const TimeTrack = {
             vue.checkTimeBoxes();
         }, 10000);
 
-        if (this.fun) {
+        if (this.fun && localStorage.getItem('noJokes') === null) {
             let jokeService = new JokeService();
             setInterval(() => {
                 jokeService.tell();
@@ -674,3 +674,7 @@ function getRandomID() {
 }
 
 const TimeTrackApp = Vue.createApp(TimeTrack).mount('#root');
+
+function iHateToHaveFun() {
+    localStorage.setItem('noJokes', 1);
+}
\ No newline at end of file