diff --git a/modules/portal/portal-impl/src/main/java/com/enonic/xp/portal/impl/handler/api/ApiHandler.java b/modules/portal/portal-impl/src/main/java/com/enonic/xp/portal/impl/handler/api/ApiHandler.java
index e164e3c5889..bfd4e998de1 100644
--- a/modules/portal/portal-impl/src/main/java/com/enonic/xp/portal/impl/handler/api/ApiHandler.java
+++ b/modules/portal/portal-impl/src/main/java/com/enonic/xp/portal/impl/handler/api/ApiHandler.java
@@ -40,7 +40,7 @@ public class ApiHandler
 {
     private static final Pattern URL_PATTERN = Pattern.compile( "^/api$" );
 
-    private static final ApplicationKey WELCOME_APP_KEY = ApplicationKey.from( "com.enonic.xp.app.welcome" );
+    private static final ApplicationKey SDK_APP_KEY = ApplicationKey.from( "com.enonic.xp.sdk" );
 
     private final ApplicationService applicationService;
 
@@ -70,7 +70,7 @@ public void activate( final ApiConfig config )
     @Override
     protected boolean canHandle( final WebRequest webRequest )
     {
-        boolean isSDK = applicationService.get( WELCOME_APP_KEY ) != null;
+        boolean isSDK = applicationService.get( SDK_APP_KEY ) != null;
         boolean isIndexEnabled = isSDK || RunMode.get() == RunMode.DEV
             ? apiIndexMode == ApiIndexMode.ON || apiIndexMode == ApiIndexMode.AUTO
             : apiIndexMode == ApiIndexMode.ON;
diff --git a/modules/portal/portal-impl/src/test/java/com/enonic/xp/portal/impl/handler/api/ApiHandlerTest.java b/modules/portal/portal-impl/src/test/java/com/enonic/xp/portal/impl/handler/api/ApiHandlerTest.java
index 9443b1eecf2..840ae9a6a4b 100644
--- a/modules/portal/portal-impl/src/test/java/com/enonic/xp/portal/impl/handler/api/ApiHandlerTest.java
+++ b/modules/portal/portal-impl/src/test/java/com/enonic/xp/portal/impl/handler/api/ApiHandlerTest.java
@@ -100,7 +100,7 @@ public void testCanHandle()
         assertFalse( this.handler.canHandle( webRequest ) );
 
         Application welcomeApp = mock( Application.class );
-        when( applicationService.get( ApplicationKey.from( "com.enonic.xp.app.welcome" ) ) ).thenReturn( welcomeApp );
+        when( applicationService.get( ApplicationKey.from( "com.enonic.xp.sdk" ) ) ).thenReturn( welcomeApp );
         when( apiConfig.api_index_enabled() ).thenReturn( "on" );
         assertTrue( this.handler.canHandle( webRequest ) );
     }