diff --git a/source/funkin/backend/MusicBeatState.hx b/source/funkin/backend/MusicBeatState.hx
index 791007f4..fc89b4d5 100644
--- a/source/funkin/backend/MusicBeatState.hx
+++ b/source/funkin/backend/MusicBeatState.hx
@@ -171,8 +171,7 @@ class MusicBeatState extends FlxState implements IBeatReceiver
 		// calls the function on the assigned script
 		if(stateScripts != null)
 			return stateScripts.call(name, args);
-		else
-			return null;
+		return null;
 	}
 
 	public function event<T:CancellableEvent>(name:String, event:T):T {
diff --git a/source/funkin/backend/MusicBeatSubstate.hx b/source/funkin/backend/MusicBeatSubstate.hx
index 5db43fce..3d1ad3fc 100644
--- a/source/funkin/backend/MusicBeatSubstate.hx
+++ b/source/funkin/backend/MusicBeatSubstate.hx
@@ -159,11 +159,14 @@ class MusicBeatSubstate extends FlxSubState implements IBeatReceiver
 	}
 	public function call(name:String, ?args:Array<Dynamic>, ?defaultVal:Dynamic):Dynamic {
 		// calls the function on the assigned script
-		return stateScripts.call(name, args);
+		if(stateScripts != null)
+			return stateScripts.call(name, args);
+		return null;
 	}
 
 	public function event<T:CancellableEvent>(name:String, event:T):T {
-		stateScripts.call(name, [event]);
+		if(stateScripts != null)
+			stateScripts.call(name, [event]);
 		return event;
 	}