diff --git a/awx/ui/client/src/scheduler/schedulerAdd.controller.js b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
index 785b7d9192..c8e21388a7 100644
--- a/awx/ui/client/src/scheduler/schedulerAdd.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
@@ -37,9 +37,13 @@ export default ['$filter', '$state', '$stateParams', 'AddSchedule', 'Wait',
     $scope.timeChange = () => {
         if (!Number($scope.schedulerStartHour)) {
             $scope.schedulerStartHour = '00';
-        } else if (!Number($scope.schedulerStartMinute)) {
+        }
+
+        if (!Number($scope.schedulerStartMinute)) {
             $scope.schedulerStartMinute = '00';
-        } else if (!Number($scope.schedulerStartSecond)) {
+        }
+
+        if (!Number($scope.schedulerStartSecond)) {
             $scope.schedulerStartSecond = '00';
         }
 
diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index 45ea5d5ab8..1b328b0926 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -28,9 +28,13 @@ function($filter, $state, $stateParams, EditSchedule, Wait, $scope, $rootScope,
     $scope.timeChange = () => {
         if (!Number($scope.schedulerStartHour)) {
             $scope.schedulerStartHour = '00';
-        } else if (!Number($scope.schedulerStartMinute)) {
+        }
+
+        if (!Number($scope.schedulerStartMinute)) {
             $scope.schedulerStartMinute = '00';
-        } else if (!Number($scope.schedulerStartSecond)) {
+        }
+
+        if (!Number($scope.schedulerStartSecond)) {
             $scope.schedulerStartSecond = '00';
         }