diff --git a/src/js/app/challenge-details/js/controllers/challenge-details-controller.js b/src/js/app/challenge-details/js/controllers/challenge-details-controller.js
index 36398bfd..0cbdef8e 100644
--- a/src/js/app/challenge-details/js/controllers/challenge-details-controller.js
+++ b/src/js/app/challenge-details/js/controllers/challenge-details-controller.js
@@ -344,8 +344,10 @@
     // If the challenge is active and in the registration phase we allow either
     // registration, or unregistration.
     if (((moment(challenge.phases[0].scheduledStartTime)) < moment() && (moment(challenge.registrationEndDate)) > moment()) && challenge.currentStatus == 'Active') {
-      if (vm.isRegistered && !hasSubmitted) {
-        vm.challenge.allowToUnregister = true;
+      if (vm.isRegistered) {
+        if (!hasSubmitted) {
+          vm.challenge.allowToUnregister = true;
+        }
       } else {
         vm.challenge.registrationDisabled = false;
       }