diff --git a/pkg/extension/server.go b/pkg/extension/server.go
index bb0f097da1f3b42082860a4840df5014c9493c4c..7e994f6d4a1f977eacdf458bba99320336c00003 100644
--- a/pkg/extension/server.go
+++ b/pkg/extension/server.go
@@ -115,7 +115,7 @@ func (s *Server) Action(ctx context.Context, in *pb.ActionRequest) (*pb.ActionRe
 		return nil, errors.New("extension ID required")
 	}
 
-	svc, ok := s.extensions[in.Extension]
+	svc, ok := s.extensions[ext]
 	if !ok {
 		return nil, ErrUnknownExtension
 	}
diff --git a/pkg/extension/server_test.go b/pkg/extension/server_test.go
index 2f19ba570339de6fa8a9b1d9bff79f95d924de03..d5dcf76ef8dd5be439257c0698a717081fa5d5cd 100644
--- a/pkg/extension/server_test.go
+++ b/pkg/extension/server_test.go
@@ -9,6 +9,7 @@ import (
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 	"git.perx.ru/perxis/perxis-go/pkg/operation"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 // не актуальные тесты
@@ -194,9 +195,11 @@ func TestServer_Action(t *testing.T) {
 			srv := NewServer(operation.NewDefaultService(), tt.services)
 			got, err := srv.Action(context.Background(), tt.in)
 			if tt.wantErr != "" {
+				require.Error(t, err)
 				assert.EqualErrorf(t, err, tt.wantErr, fmt.Sprintf("Action(%v)", tt.in))
 				return
 			}
+			require.NoError(t, err)
 			assert.Equalf(t, tt.want, got, "Action(%v)", tt.in)
 		})
 	}