diff --git a/app/libs/limelight-common.jar b/app/libs/limelight-common.jar
index 2bffce06..c1b93feb 100644
Binary files a/app/libs/limelight-common.jar and b/app/libs/limelight-common.jar differ
diff --git a/app/src/main/java/com/limelight/AppView.java b/app/src/main/java/com/limelight/AppView.java
index 6e263d4c..4276180e 100644
--- a/app/src/main/java/com/limelight/AppView.java
+++ b/app/src/main/java/com/limelight/AppView.java
@@ -432,7 +432,8 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         intent.putExtra(Game.EXTRA_HOST,
                 computer.reachability == ComputerDetails.Reachability.LOCAL ?
                 computer.localIp.getHostAddress() : computer.remoteIp.getHostAddress());
-        intent.putExtra(Game.EXTRA_APP, app.getAppName());
+        intent.putExtra(Game.EXTRA_APP_NAME, app.getAppName());
+        intent.putExtra(Game.EXTRA_APP_ID, app.getAppId());
         intent.putExtra(Game.EXTRA_UNIQUEID, managerBinder.getUniqueId());
         intent.putExtra(Game.EXTRA_STREAMING_REMOTE,
                 computer.reachability != ComputerDetails.Reachability.LOCAL);
diff --git a/app/src/main/java/com/limelight/Game.java b/app/src/main/java/com/limelight/Game.java
index 0e327ae1..d4670926 100644
--- a/app/src/main/java/com/limelight/Game.java
+++ b/app/src/main/java/com/limelight/Game.java
@@ -89,7 +89,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     private int drFlags = 0;
 
     public static final String EXTRA_HOST = "Host";
-    public static final String EXTRA_APP = "App";
+    public static final String EXTRA_APP_NAME = "AppName";
+    public static final String EXTRA_APP_ID = "AppId";
     public static final String EXTRA_UNIQUEID = "UniqueId";
     public static final String EXTRA_STREAMING_REMOTE = "Remote";
 
@@ -171,17 +172,24 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         wifiLock.acquire();
 
         String host = Game.this.getIntent().getStringExtra(EXTRA_HOST);
-        String app = Game.this.getIntent().getStringExtra(EXTRA_APP);
+        String appName = Game.this.getIntent().getStringExtra(EXTRA_APP_NAME);
+        int appId = Game.this.getIntent().getIntExtra(EXTRA_APP_ID, StreamConfiguration.INVALID_APP_ID);
         String uniqueId = Game.this.getIntent().getStringExtra(EXTRA_UNIQUEID);
         boolean remote = Game.this.getIntent().getBooleanExtra(EXTRA_STREAMING_REMOTE, false);
 
+        if (appId == StreamConfiguration.INVALID_APP_ID) {
+            finish();
+            return;
+        }
+
         decoderRenderer = new ConfigurableDecoderRenderer();
         decoderRenderer.initializeWithFlags(drFlags);
         
         StreamConfiguration config = new StreamConfiguration.Builder()
                 .setResolution(prefConfig.width, prefConfig.height)
                 .setRefreshRate(prefConfig.fps)
-                .setApp(app)
+                .setApp(appName)
+                .setAppId(appId)
                 .setBitrate(prefConfig.bitrate * 1000)
                 .setEnableSops(prefConfig.enableSops)
                 .enableAdaptiveResolution((decoderRenderer.getCapabilities() &