diff --git a/src/slurmrestd/operations.c b/src/slurmrestd/operations.c
index 97a8f7b..6883f44 100644
--- a/src/slurmrestd/operations.c
+++ b/src/slurmrestd/operations.c
@@ -674,7 +674,10 @@
 	FREE_NULL_DATA(params);
 
 	/* always clear the auth context */
-	FREE_NULL_REST_AUTH(args->context->auth);
+	if (args->context) {
+		void *auth = http_context_set_auth(args->context, NULL);
+		FREE_NULL_REST_AUTH(auth);
+	}
 
 	return rc;
 }