diff --git a/internal/bbsimctl/commands/oltalarms.go b/internal/bbsimctl/commands/oltalarms.go
index 645aade..f251b83 100755
--- a/internal/bbsimctl/commands/oltalarms.go
+++ b/internal/bbsimctl/commands/oltalarms.go
@@ -75,10 +75,18 @@
 	ctx, cancel := context.WithTimeout(context.Background(), config.GlobalConfig.Grpc.Timeout)
 	defer cancel()
 
-	req := pb.OLTAlarmRequest{InterfaceType: string(o.Args.Name),
+	req := pb.OLTAlarmRequest{
 		InterfaceID: uint32(o.Args.IntfID),
 		Status:      "on"}
 
+	if string(o.Args.Name) == "PonLossOfSignal" {
+		req.InterfaceType = "pon"
+	} else if string(o.Args.Name) == "NniLossOfSignal" {
+		req.InterfaceType = "nni"
+	} else {
+		return fmt.Errorf("Unknown alarm type")
+	}
+
 	res, err := client.SetOltAlarmIndication(ctx, &req)
 	if err != nil {
 		log.Fatalf("Cannot raise OLT alarm: %v", err)
@@ -97,10 +105,18 @@
 	ctx, cancel := context.WithTimeout(context.Background(), config.GlobalConfig.Grpc.Timeout)
 	defer cancel()
 
-	req := pb.OLTAlarmRequest{InterfaceType: string(o.Args.Name),
+	req := pb.OLTAlarmRequest{
 		InterfaceID: uint32(o.Args.IntfID),
 		Status:      "off"}
 
+	if string(o.Args.Name) == "PonLossOfSignal" {
+		req.InterfaceType = "pon"
+	} else if string(o.Args.Name) == "NniLossOfSignal" {
+		req.InterfaceType = "nni"
+	} else {
+		return fmt.Errorf("Unknown alarm type")
+	}
+
 	res, err := client.SetOltAlarmIndication(ctx, &req)
 
 	if err != nil {