diff --git a/package-lock.json b/package-lock.json
index d7ea9bd01d41ebfe69f84d194ab3077082122603..0b52210c338c9cceb016958482e87cd9d7a52714 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "course-search-enroll-fe",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c1104c92ed2a85fee9eded2f8587a05d8a2ed51e..b22209ae513134c4ecdcabe0a6d2c6aef78b09d1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "course-search-enroll-fe",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --proxy-config proxy.json --open",
diff --git a/src/app/degree-planner/term-container/term-container.component.html b/src/app/degree-planner/term-container/term-container.component.html
index c4caaafc7a0e38320c1186edcc15df9d3419263d..a6693bab749998aedc0826384f446efe7a87b69d 100644
--- a/src/app/degree-planner/term-container/term-container.component.html
+++ b/src/app/degree-planner/term-container/term-container.component.html
@@ -135,7 +135,7 @@
       </div>
     </div>
 
-    <p class="credit-overload-warning" *ngIf="tooManyCredits$ | async">
+    <p class="credit-overload-warning" *ngIf="((visibleCredits === 'planned') && (tooManyCredits$ | async)) || ((visibleCredits === 'enrolled') && (enrolledCredits > maxAllowedCredits))">
       Warning: credit overload
     </p>
 
diff --git a/src/app/degree-planner/term-container/term-container.component.scss b/src/app/degree-planner/term-container/term-container.component.scss
index a1fecdee91855e345107a605e0e3ceebfed338d8..17085ba226c1fd15c90d0f5bf27be3f1d756ba77 100644
--- a/src/app/degree-planner/term-container/term-container.component.scss
+++ b/src/app/degree-planner/term-container/term-container.component.scss
@@ -103,6 +103,7 @@
 }
 
 .credit-overload-warning {
+  margin-bottom: 0;
   margin-top: 0;
   color: #ff8000;
 }
diff --git a/src/app/degree-planner/term-container/term-container.component.ts b/src/app/degree-planner/term-container/term-container.component.ts
index 093521099e299bdc0c65dd7ca5c02e14099c8a4c..fb3ed32cdee0a2c9bebf6d4bccb39e8f6e5b1720 100644
--- a/src/app/degree-planner/term-container/term-container.component.ts
+++ b/src/app/degree-planner/term-container/term-container.component.ts
@@ -79,6 +79,7 @@ export class TermContainerComponent implements OnInit, OnDestroy {
   public courseNotOfferedInTerm: ReadonlyArray<Course>;
   public mobileView: MediaQueryList;
   public assistiveText: string;
+  public maxAllowedCredits: number;
 
   constructor(
     public dialog: MatDialog,
@@ -102,8 +103,8 @@ export class TermContainerComponent implements OnInit, OnDestroy {
       map(term => {
         if (this.constants.isUndergrad()) {
           const credits = sumCredits(term.plannedCourses);
-          const maxAllowedCredits = maximumAllowedCreditsForTerm(term.termCode);
-          return credits.min >= maxAllowedCredits;
+          this.maxAllowedCredits = maximumAllowedCreditsForTerm(term.termCode);
+          return credits.min >= this.maxAllowedCredits;
         } else {
           return false;
         }
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 704b00c221a4ce227b3fa3dca134a56f9bd20932..0e8aff42f8796e0c8e02bfd06bdd9e0e747d8e7e 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,6 +1,6 @@
 export const environment = {
   production: true,
-  version: '1.0.23',
+  version: '1.0.24',
   apiPlannerUrl: '/api/planner/v1',
   apiSearchUrl: '/api/search/v1',
   apiEnrollUrl: '/api/enroll/v1',