diff --git a/components/server/src/workspace/gitpod-server-impl.ts b/components/server/src/workspace/gitpod-server-impl.ts
index f0dfb1ff04b231..f505688cf9d0a5 100644
--- a/components/server/src/workspace/gitpod-server-impl.ts
+++ b/components/server/src/workspace/gitpod-server-impl.ts
@@ -139,6 +139,7 @@ import { getPrimaryEmail } from "@gitpod/public-api-common/lib/user-utils";
 import { AnalyticsController } from "../analytics-controller";
 import { ClientHeaderFields } from "../express-util";
 import { filter } from "../util/objects";
+import { isWorkspaceStartBlockedBySunset } from "../util/featureflags";
 
 // shortcut
 export const traceWI = (ctx: TraceContext, wi: Omit<logcontext, "userId">) => TraceContext.setOWI(ctx, wi); // userId is already taken care of in WebsocketConnectionManager
@@ -581,6 +582,16 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
 const { workspace, latestInstance: instance } = await this.workspaceService.getWorkspace(user.id, workspaceId);
 await this.guardAccess({ kind: "workspace", subject: workspace }, "get");
 
+ // Check if user is blocked by Classic PAYG sunset
+ if (
+ await isWorkspaceStartBlockedBySunset(user, workspace.organizationId, this.config.isDedicatedInstallation)
+ ) {
+ throw new ApplicationError(
+ ErrorCodes.PERMISSION_DENIED,
+ "Gitpod Classic PAYG has sunset. Please visit https://app.ona.com/login to continue.",
+ );
+ }
+
 // (gpl) We keep this check here for backwards compatibility, it should be superfluous in the future
 if (instance && instance.status.phase !== "stopped") {
 traceWI(ctx, { instanceId: instance.id });
@@ -850,6 +861,16 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
 
 logContext = { userId: user.id };
 
+ // Check if user is blocked by Classic PAYG sunset
+ if (
+ await isWorkspaceStartBlockedBySunset(user, options.organizationId, this.config.isDedicatedInstallation)
+ ) {
+ throw new ApplicationError(
+ ErrorCodes.PERMISSION_DENIED,
+ "Gitpod Classic PAYG has sunset. Please visit https://app.ona.com/login to continue.",
+ );
+ }
+
 normalizedContextUrl = this.contextParser.normalizeContextURL(contextUrl);
 
 const { context, project } = await this.contextService.parseContext(user, contextUrl, {
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://patch-diff.githubusercontent.com/raw/gitpod-io/gitpod/pull/21108.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://patch-diff.githubusercontent.com/raw/gitpod-io/gitpod/pull/21108.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>