diff --git a/src/checkout.c b/src/checkout.c
index 72ee8b624..f11102c8b 100644
--- a/src/checkout.c
+++ b/src/checkout.c
@@ -2722,7 +2722,7 @@ int git_checkout_tree(
 	if ((error = git_repository_index(&index, repo)) < 0)
 		return error;
 
-	if ((opts->checkout_strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH)) {
+	if (opts && (opts->checkout_strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH)) {
 		iter_opts.pathlist.count = opts->paths.count;
 		iter_opts.pathlist.strings = opts->paths.strings;
 	}
diff --git a/tests/checkout/tree.c b/tests/checkout/tree.c
index 7df4d7ef0..4a0314a9e 100644
--- a/tests/checkout/tree.c
+++ b/tests/checkout/tree.c
@@ -1479,3 +1479,7 @@ void test_checkout_tree__baseline_is_empty_when_no_index(void)
 	git_reference_free(head);
 }
 
+void test_checkout_tree__nullopts(void)
+{
+	cl_git_pass(git_checkout_tree(g_repo, NULL, NULL));
+}