diff --git a/cmd/devices-api/find_old_style_tasks.go b/cmd/devices-api/find_old_style_tasks.go
index c30c43f3..bcc50824 100644
--- a/cmd/devices-api/find_old_style_tasks.go
+++ b/cmd/devices-api/find_old_style_tasks.go
@@ -74,7 +74,10 @@ func (fost *findOldStyleTasks) Execute(_ context.Context, _ *flag.FlagSet, _ ...
 				break
 			}
 
+			key := string(m.Key)
+
 			if m.Value == nil {
+				delete(missing, key)
 				continue
 			}
 
@@ -85,8 +88,6 @@ func (fost *findOldStyleTasks) Execute(_ context.Context, _ *flag.FlagSet, _ ...
 				panic(err)
 			}
 
-			key := string(m.Key)
-
 			if out.Data.SyntheticDevice == nil {
 				missing[key] = out
 			} else {