diff --git a/src/Server/Coderr.Server.Web/ViewModels/Incident/Components/IncidentTable.js b/src/Server/Coderr.Server.Web/ViewModels/Incident/Components/IncidentTable.js
index a1ed9d23..f69ca7ee 100644
--- a/src/Server/Coderr.Server.Web/ViewModels/Incident/Components/IncidentTable.js
+++ b/src/Server/Coderr.Server.Web/ViewModels/Incident/Components/IncidentTable.js
@@ -18,6 +18,7 @@ var IncidentTableViewModel = (function () {
         query.IsNew = true;
         if (applicationId != null) {
             query.ApplicationId = applicationId;
+            this.applicationId = applicationId;
         }
         if (applicationVersion != null) {
             query.Version = applicationVersion;
@@ -166,6 +167,9 @@ var IncidentTableViewModel = (function () {
         var _this = this;
         if (pageNumber === void 0) { pageNumber = 0; }
         var query = new codeRR.Core.Incidents.Queries.FindIncidents();
+        if (this.applicationId != null) {
+            query.ApplicationId = this.applicationId;
+        }
         query.SortType = this.sortType;
         query.SortAscending = this.sortAscending;
         if (this.incidentType === "closed") {
diff --git a/src/Server/Coderr.Server.Web/ViewModels/Incident/Components/IncidentTable.js.map b/src/Server/Coderr.Server.Web/ViewModels/Incident/Components/IncidentTable.js.map
index e2822987..ae1fb811 100644
--- a/src/Server/Coderr.Server.Web/ViewModels/Incident/Components/IncidentTable.js.map
+++ b/src/Server/Coderr.Server.Web/ViewModels/Incident/Components/IncidentTable.js.map
@@ -1 +1 @@
-{"version":3,"file":"IncidentTable.js","sourceRoot":"","sources":["IncidentTable.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"IncidentTable.js","sourceRoot":"","sources":["IncidentTable.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/src/Server/Coderr.Server.Web/ViewModels/Incident/Components/IncidentTable.ts b/src/Server/Coderr.Server.Web/ViewModels/Incident/Components/IncidentTable.ts
index e46de3c4..0aaaca6c 100644
--- a/src/Server/Coderr.Server.Web/ViewModels/Incident/Components/IncidentTable.ts
+++ b/src/Server/Coderr.Server.Web/ViewModels/Incident/Components/IncidentTable.ts
@@ -28,6 +28,7 @@ class IncidentTableViewModel implements Griffin.WebApp.IPagerSubscriber {
         query.IsNew = true;
         if (applicationId != null) {
             query.ApplicationId = applicationId;
+            this.applicationId = applicationId;
         }
         if (applicationVersion != null) {
             query.Version = applicationVersion;
@@ -193,6 +194,11 @@ class IncidentTableViewModel implements Griffin.WebApp.IPagerSubscriber {
 
     private loadItems(pageNumber: number = 0): void {
         const query = new codeRR.Core.Incidents.Queries.FindIncidents();
+
+        if (this.applicationId != null) {
+            query.ApplicationId = this.applicationId;
+        }
+
         query.SortType = this.sortType;
         query.SortAscending = this.sortAscending;
         if (this.incidentType === "closed") {