diff --git a/server.py b/server.py
index 0787a40..95058c6 100755
--- a/server.py
+++ b/server.py
@@ -342,7 +342,7 @@ def index():
         if not jokes_settings['categories']:
             jokes_settings['categories'] = ['Any']
     except:
-        jokes_settings = {"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": True, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}
+        jokes_settings = {"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": True, "safe": True, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}
 	
     try:
         f = open('csv/scheduler.json','r')
@@ -1346,12 +1346,13 @@ def save_jokes_settings(input_settings):
         current_settings = json.load(f)
         f.close()
     except:
-        current_settings = {"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": True, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}
+        current_settings = {"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": True, "safe": True, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}
 
     current_settings['speed'] = input_settings['speed'].lower()
     current_settings['speed2'] = input_settings['speed2'].lower()
     current_settings['animation'] = input_settings['animation'].lower()
     current_settings['title'] = input_settings['title']
+    current_settings['safe'] = input_settings['safe']
     if not input_settings['categories']:
         current_settings['categories'] = ['Any']
     else: