diff --git a/Scripts/server_api.gd b/Scripts/server_api.gd
index f2e3166..afe5572 100644
--- a/Scripts/server_api.gd
+++ b/Scripts/server_api.gd
@@ -4,6 +4,10 @@ extends Resource
 enum BugbotServerError { OK, THREAD_NULL, THREAD_BUSY, API_RESPONSE_ERROR }
 enum BugbotTagArray { VERSION, HARDWARE, OS, COMPONENT, SEVERITY, MAX }
 
+const DEFAULT_SHOW_UNRESOLVED_BUGS : bool = true
+const DEFAULT_SHOW_IN_PROGRESS_BUGS : bool = true
+const DEFAULT_SHOW_RESOLVED_BUGS : bool = false
+
 const UNRESOLVED_TAG : StringName = &"UNRESOLVED"
 const IN_PROGRESS_TAG : StringName = &"IN_PROGRESS"
 const RESOLVED_TAG : StringName = &"RESOLVED"
diff --git a/Scripts/server_gitea_api.gd b/Scripts/server_gitea_api.gd
index 10384ad..ab2ca24 100644
--- a/Scripts/server_gitea_api.gd
+++ b/Scripts/server_gitea_api.gd
@@ -40,9 +40,9 @@ func __return_list_of_bugs_thread(map_name:String, callback:Callable) -> void:
 	
 	var bug_array : Array
 	var label_dict : Dictionary = {
-		"show_unresolved": ProjectSettings.get_setting("bugbot/markers/unresolved/show_unresolved_bugs", true),
-		"show_in_progress": ProjectSettings.get_setting("bugbot/markers/in_progress/show_in_progress_bugs", true),
-		"show_resolved": ProjectSettings.get_setting("bugbot/markers/resolved/show_resolved_bugs", false),
+		"show_unresolved": ProjectSettings.get_setting("bugbot/markers/unresolved/show_unresolved_bugs", BugbotServerAPI.DEFAULT_SHOW_UNRESOLVED_BUGS),
+		"show_in_progress": ProjectSettings.get_setting("bugbot/markers/in_progress/show_in_progress_bugs", BugbotServerAPI.DEFAULT_SHOW_IN_PROGRESS_BUGS),
+		"show_resolved": ProjectSettings.get_setting("bugbot/markers/resolved/show_resolved_bugs", BugbotServerAPI.DEFAULT_SHOW_RESOLVED_BUGS),
 		
 		"unresolved_labels": ProjectSettings.get_setting("bugbot/reporting/gitea/status_labels/unresolved_statuses", Array()),
 		"in_progress_labels": ProjectSettings.get_setting("bugbot/reporting/gitea/status_labels/in_progress_statuses", Array()),
diff --git a/Scripts/server_jira_api.gd b/Scripts/server_jira_api.gd
index 65b4d5b..3f319c9 100644
--- a/Scripts/server_jira_api.gd
+++ b/Scripts/server_jira_api.gd
@@ -58,9 +58,9 @@ func __return_list_of_bugs_thread(map_name:String, callback:Callable) -> void:
 		var issues_array : Array = issue_response["issues"]
 		for issue:Dictionary in issues_array:
 			var label_dict : Dictionary = {
-				"show_unresolved": ProjectSettings.get_setting("bugbot/markers/unresolved/show_unresolved_bugs", true),
-				"show_in_progress": ProjectSettings.get_setting("bugbot/markers/in_progress/show_in_progress_bugs", true),
-				"show_resolved": ProjectSettings.get_setting("bugbot/markers/resolved/show_resolved_bugs", false),
+				"show_unresolved": ProjectSettings.get_setting("bugbot/markers/unresolved/show_unresolved_bugs", BugbotServerAPI.DEFAULT_SHOW_UNRESOLVED_BUGS),
+				"show_in_progress": ProjectSettings.get_setting("bugbot/markers/in_progress/show_in_progress_bugs", BugbotServerAPI.DEFAULT_SHOW_IN_PROGRESS_BUGS),
+				"show_resolved": ProjectSettings.get_setting("bugbot/markers/resolved/show_resolved_bugs", BugbotServerAPI.DEFAULT_SHOW_RESOLVED_BUGS),
 				
 				"unresolved_labels": ProjectSettings.get_setting("bugbot/reporting/jira/status_labels/unresolved_statuses", DEFAULT_UNRESOLVED_STATUSES),
 				"in_progress_labels": ProjectSettings.get_setting("bugbot/reporting/jira/status_labels/in_progress_statuses", DEFAULT_IN_PROGRESS_STATUSES),