diff --git a/src/Server/Controllers/ApplicationController.cs b/src/Server/Controllers/ApplicationController.cs
index 5d74675..1017332 100644
--- a/src/Server/Controllers/ApplicationController.cs
+++ b/src/Server/Controllers/ApplicationController.cs
@@ -10,13 +10,19 @@ namespace BoredCareers.Controllers {
         public ApplicationController(DatabaseService db) : base(db) {}
 
         [HttpGet]
-        public async Task<IActionResult> GetApplication(int ApplicationID) {
+        public async Task<IActionResult> GetApplication(int? ApplicationID, int? JobListingID) {
             if (isLoggedIn()) {
-                Application? application = await _databaseService.GetApplication(ApplicationID);
-                if (application != null) {
-                    return Ok(application);
+                if (ApplicationID != null) {
+                    Application? application = await _databaseService.GetApplication(Convert.ToInt32(ApplicationID));
+                    if (application != null) {
+                        return Ok(application);
+                    }
+                    return NotFound("Application doesn't exist");
+                } else if (JobListingID != null) {
+                    Application[] applications = await _databaseService.GetApplicationsFromJobListing(Convert.ToInt32(JobListingID));
+                    return Ok(applications);
                 }
-                return NotFound("Application doesn't exist");
+                return NotFound("No query selector supplied");
             }
             return NotFound("Not logged in");
         }