diff --git a/scripts/client/scoreboard.js b/scripts/client/scoreboard.js
index 1f525ad4..4dd5ba51 100644
--- a/scripts/client/scoreboard.js
+++ b/scripts/client/scoreboard.js
@@ -23,6 +23,14 @@ bindEventHandler("OnResourceReady", thisResource, function(event, resource) {
 // ----------------------------------------------------------------------------
 
 addEventHandler("OnDrawnHUD", function (event) {
+	if(!renderHUD) {
+		return false;
+	}
+
+	if(!renderScoreboard) {
+		return false;
+	}
+
 	if(localPlayer != null) {
 		if(isKeyDown(SDLK_TAB)) {
 			if(listFont != null && titleFont != null) {