diff --git a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
index 355b2c9b..418f0e77 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
@@ -462,9 +462,9 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
 
 			this.issueComment = timelineComment;
 
-			if (timelineLastView) {
-				// timelineLine2.setVisibility(View.GONE);
-			}
+			// if (timelineLastView) {
+			// timelineLine2.setVisibility(View.GONE);
+			// }
 
 			StringBuilder infoBuilder = null;
 			if (issueComment.getCreatedAt() != null) {
@@ -485,6 +485,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
 							.append(context.getString(R.string.modifiedText));
 				}
 			}
+			assert infoBuilder != null;
 			String info = infoBuilder.toString();
 
 			// label view in timeline
@@ -701,17 +702,24 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
 									issueComment.getMilestone().getTitle(),
 									info));
 				} else {
-					start.setText(
-							context.getString(
-									R.string.timelineMilestoneRemoved,
-									issueComment.getUser().getLogin(),
-									issueComment.getOldMilestone().getTitle(),
-									info));
+					if (issueComment.getOldMilestone() != null) {
+						start.setText(
+								context.getString(
+										R.string.timelineMilestoneRemoved,
+										issueComment.getUser().getLogin(),
+										issueComment.getOldMilestone().getTitle(),
+										info));
+					} else {
+						start.setText(
+								context.getString(
+										R.string.timelineMilestoneDeleted,
+										issueComment.getUser().getLogin(),
+										info));
+					}
 					timelineIcon.setColorFilter(
 							context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
 				}
 				start.setTextSize(fontSize);
-
 				timelineIcon.setImageDrawable(
 						ContextCompat.getDrawable(context, R.drawable.ic_milestone));
 				timelineData.addView(start);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f8634fe9..5642f91c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -814,6 +814,7 @@
     <string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string>
     <string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string>