diff --git a/pkg/cmd/addon/disable/exec.go b/pkg/cmd/addon/disable/exec.go
index c4a84639a..22aa2ee9c 100644
--- a/pkg/cmd/addon/disable/exec.go
+++ b/pkg/cmd/addon/disable/exec.go
@@ -108,9 +108,12 @@ func (o *Options) runWithClient(clusterClient clusterclientset.Interface,
 			if err != nil {
 				if !errors.IsNotFound(err) {
 					return err
+				} else {
+					fmt.Fprintf(o.Streams.Out, "%s add-on not found in cluster: %s.\n", addon, clusterName)
 				}
+			} else {
+				fmt.Fprintf(o.Streams.Out, "Undeploying %s add-on in managed cluster: %s.\n", addon, clusterName)
 			}
-			fmt.Fprintf(o.Streams.Out, "Undeploying %s add-on in managed cluster: %s.\n", addon, clusterName)
 		}
 	}