diff --git a/cli/set.go b/cli/set.go
index 50dda7bb1af3d7310243d38f22e470ff78499a98..4d01d1477fd281446c3666faaf69e9a9899f7347 100644
--- a/cli/set.go
+++ b/cli/set.go
@@ -6,6 +6,7 @@ import (
 	"code.fbi.h-da.de/cocsn/gosdn/nucleus/util/proto"
 	"context"
 	pb "google.golang.org/protobuf/proto"
+	"os"
 )
 
 // Set sends a gNMI Set request to the specified target. Only one
@@ -39,8 +40,11 @@ func Set(a, u, p, typ string, args ...string) error {
 		return err
 	}
 
-	if err := proto.Write(resp.(pb.Message), "resp-set-system-config-hostname"); err != nil {
-		return err
+	_, tap := os.LookupEnv("GOSDN_TAP")
+	if tap {
+		if err := proto.Write(resp.(pb.Message), "resp-set-system-config-hostname"); err != nil {
+			return err
+		}
 	}
 	return nil
 }