diff --git a/subcommands/targets/offline-update.go b/subcommands/targets/offline-update.go
index c8beafa9..c6406627 100644
--- a/subcommands/targets/offline-update.go
+++ b/subcommands/targets/offline-update.go
@@ -256,7 +256,7 @@ func downloadTufRepo(factory string, target string, tag string, prod bool, wave
 	// v2 - auto-generated by ota-lite to take keys online (default, on Factory creation);
 	ver := 3
 	downloadMetadataFile := func(metadataFileName string) error {
-		data, err := api.TufMetadataGet(factory, metadataFileName, tag, prod)
+		data, err := api.TufMetadataGet(factory, metadataFileName, tag, prod || len(wave) > 0)
 		if err != nil {
 			return err
 		}