diff --git a/src/main/java/com/booleanuk/cohorts/controllers/StudentController.java b/src/main/java/com/booleanuk/cohorts/controllers/StudentController.java
index 7da9ea5..f219b45 100644
--- a/src/main/java/com/booleanuk/cohorts/controllers/StudentController.java
+++ b/src/main/java/com/booleanuk/cohorts/controllers/StudentController.java
@@ -160,10 +160,6 @@ public ResponseEntity<?> updateStudent(@PathVariable int id, @RequestBody Studen
             return new ResponseEntity<>("User not found", HttpStatus.NOT_FOUND);
         }
 
-        Cohort cohort = cohortRepository.findById(studentRequest.getCohortId()).orElse(null);
-        if (cohort == null) {
-            return new ResponseEntity<>("Cohort not found", HttpStatus.NOT_FOUND);
-        }
 
         Profile profile = profileRepository.findById(user.getProfile().getId()).orElse(null);
         if (profile == null) {
@@ -194,12 +190,11 @@ public ResponseEntity<?> updateStudent(@PathVariable int id, @RequestBody Studen
             profile.setGithubUrl(studentRequest.getGithub_username());
         }
 
+        Cohort cohort = cohortRepository.findById(studentRequest.getCohortId()).orElse(null);
         if (cohort!=null) {
             profile.setCohort(cohort);
         }
 
-        profile.setCohort(cohort);
-
 
         if (studentRequest.getEmail() != null) {
             boolean emailExists = userRepository.existsByEmail(studentRequest.getEmail());