diff --git a/controller/api/initialise_test.go b/controller/api/initialise_test.go
index c9363a7f44540d527caa8c04cfcc441645307752..8a7395f0f036b3eb3d9ad093d6223d59ce00989e 100644
--- a/controller/api/initialise_test.go
+++ b/controller/api/initialise_test.go
@@ -90,7 +90,7 @@ func bootstrapUnitTest() {
 	mockPnd.On("PendingChanges").Return([]uuid.UUID{changeUUID})
 	mockPnd.On("CommittedChanges").Return([]uuid.UUID{changeUUID})
 	mockPnd.On("GetChange", mock.Anything).Return(mockChange, nil)
-	mockPnd.On("AddDevice", mock.Anything, mock.Anything, mock.Anything).Return(nil)
+	mockPnd.On("AddDevice", mock.Anything, mock.Anything, mock.Anything).Return(nil, nil)
 	mockPnd.On("GetDevice", mock.Anything).Return(&nucleus.CommonDevice{
 		UUID:  deviceUUID,
 		Model: &openconfig.Device{},
diff --git a/controller/northbound/server/pnd.go b/controller/northbound/server/pnd.go
index fc009d5e5afa65519d32993815297f63f0f1ff9e..52eb9082897b5f835201e14e0098fb3d7dfa1450 100644
--- a/controller/northbound/server/pnd.go
+++ b/controller/northbound/server/pnd.go
@@ -506,15 +506,16 @@ func (p pndServer) SetOndList(ctx context.Context, request *ppb.SetOndListReques
 		}
 		deviceIDs = append(deviceIDs, did)
 	}
+
+	r := make([]*ppb.SetResponse, len(deviceIDs))
+	for i, did := range deviceIDs {
+		r[i] = &ppb.SetResponse{Id: did.String(), Status: ppb.Status_STATUS_OK}
+	}
+
 	return &ppb.SetOndListResponse{
 		Timestamp: time.Now().UnixNano(),
 		Status:    ppb.Status_STATUS_OK,
-		Responses: []*ppb.SetResponse{
-			{
-				Id:     "",
-				Status: ppb.Status_STATUS_OK,
-			},
-		},
+		Responses: r,
 	}, nil
 }