diff --git a/internal/cloudapi/server.go b/internal/cloudapi/server.go
index a1a4b567e..7971966a2 100644
--- a/internal/cloudapi/server.go
+++ b/internal/cloudapi/server.go
@@ -609,7 +609,7 @@ func (server *Server) ComposeMetadata(w http.ResponseWriter, r *http.Request, id
 	resp := new(ComposeMetadata)
 	resp.Packages = &packages
 
-	if ostreeCommitResult != nil {
+	if ostreeCommitResult != nil && ostreeCommitResult.Metadata != nil {
 		commitMetadata, ok := ostreeCommitResult.Metadata.(*osbuild1.OSTreeCommitStageMetadata)
 		if !ok {
 			panic("Failed to convert ostree commit stage metadata")