diff --git a/src/app/issues-viewer/card-view/card-view.component.html b/src/app/issues-viewer/card-view/card-view.component.html
index 40770db3..37b3e98e 100644
--- a/src/app/issues-viewer/card-view/card-view.component.html
+++ b/src/app/issues-viewer/card-view/card-view.component.html
@@ -6,7 +6,7 @@
   <div class="scrollable-container-wrapper">
     <div class="scrollable-container">
       <div class="issue-pr-cards" *ngFor="let issue of this.issues$ | async; index as i">
-        <app-issue-pr-card [issue]="issue" [filter]="issues.filter"></app-issue-pr-card>
+        <app-issue-pr-card [issue]="issue" [filter]="issues.filter" [milestoneService]="milestoneService"></app-issue-pr-card>
       </div>
       <mat-card class="loading-spinner" *ngIf="this.issues.isLoading$ | async">
         <mat-progress-spinner color="primary" mode="indeterminate" diameter="50" strokeWidth="5"></mat-progress-spinner>
diff --git a/src/app/shared/issue-pr-card/issue-pr-card-milestone/issue-pr-card-milestone.component.html b/src/app/shared/issue-pr-card/issue-pr-card-milestone/issue-pr-card-milestone.component.html
index b4e9a47c..8ad0e224 100644
--- a/src/app/shared/issue-pr-card/issue-pr-card-milestone/issue-pr-card-milestone.component.html
+++ b/src/app/shared/issue-pr-card/issue-pr-card-milestone/issue-pr-card-milestone.component.html
@@ -2,7 +2,7 @@
   <span class="octicon-milestone" octicon="milestone" color="grey" size="8"> </span>
   {{ milestone.title }}
 </div>
-<div *ngIf="!milestone.state" class="milestone">
+<div *ngIf="!milestone.state && hasMilestones" class="milestone">
   <span class="octicon-milestone" octicon="milestone" color="red" size="8"> </span>
   <span style="color: red">???</span>
 </div>
diff --git a/src/app/shared/issue-pr-card/issue-pr-card-milestone/issue-pr-card-milestone.component.ts b/src/app/shared/issue-pr-card/issue-pr-card-milestone/issue-pr-card-milestone.component.ts
index 59cbb8d8..561eb583 100644
--- a/src/app/shared/issue-pr-card/issue-pr-card-milestone/issue-pr-card-milestone.component.ts
+++ b/src/app/shared/issue-pr-card/issue-pr-card-milestone/issue-pr-card-milestone.component.ts
@@ -8,6 +8,7 @@ import { Milestone } from '../../../core/models/milestone.model';
 })
 export class IssuePrCardMilestoneComponent {
   @Input() milestone: Milestone;
+  @Input() hasMilestones: boolean;
 
   constructor() {}
 }
diff --git a/src/app/shared/issue-pr-card/issue-pr-card.component.html b/src/app/shared/issue-pr-card/issue-pr-card.component.html
index 9c9c36d8..527e9446 100644
--- a/src/app/shared/issue-pr-card/issue-pr-card.component.html
+++ b/src/app/shared/issue-pr-card/issue-pr-card.component.html
@@ -3,7 +3,10 @@
     <span [matTooltip]="this.issue.updated_at">
       <app-issue-pr-card-header [issue]="issue"></app-issue-pr-card-header>
       <mat-card-content>
-        <app-issue-pr-card-milestone [milestone]="issue.milestone"></app-issue-pr-card-milestone>
+        <app-issue-pr-card-milestone
+          [milestone]="issue.milestone"
+          [hasMilestones]="!milestoneService.hasNoMilestones"
+        ></app-issue-pr-card-milestone>
         <app-issue-pr-card-labels [labels]="issue.githubLabels" [labelSet]="filter?.hiddenLabels"></app-issue-pr-card-labels>
       </mat-card-content>
     </span>
diff --git a/src/app/shared/issue-pr-card/issue-pr-card.component.ts b/src/app/shared/issue-pr-card/issue-pr-card.component.ts
index 47fbf1a8..6bc8c71b 100644
--- a/src/app/shared/issue-pr-card/issue-pr-card.component.ts
+++ b/src/app/shared/issue-pr-card/issue-pr-card.component.ts
@@ -4,6 +4,7 @@ import { Filter } from '../../core/services/filters.service';
 import { GithubService } from '../../core/services/github.service';
 import { LabelService } from '../../core/services/label.service';
 import { LoggingService } from '../../core/services/logging.service';
+import { MilestoneService } from '../../core/services/milestone.service';
 
 @Component({
   selector: 'app-issue-pr-card',
@@ -13,6 +14,7 @@ import { LoggingService } from '../../core/services/logging.service';
 export class IssuePrCardComponent {
   @Input() issue: Issue;
   @Input() filter?: Filter;
+  @Input() milestoneService: MilestoneService;
 
   constructor(private logger: LoggingService, private githubService: GithubService, public labelService: LabelService) {}