diff --git a/server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java b/server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
index 3ff245fd7e..e622485270 100644
--- a/server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
+++ b/server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
@@ -58,6 +58,7 @@ public class GetTranslationHistoryHandler extends
     @Inject
     private ResourceUtils resourceUtils;
 
+    // TODO: Refactor duplicated code in getTranslationHistory
     @Override
     public GetTranslationHistoryResult execute(
             GetTranslationHistoryAction action, ExecutionContext context)
@@ -83,6 +84,9 @@ public GetTranslationHistoryResult execute(
         Map<Integer, HTextFlowTargetHistory> history = Maps.newHashMap();
         TransHistoryItem latest =
                 getLatest(hTextFlowTarget, hTextFlow, hLocale);
+        if (hTextFlowTarget != null) {
+            history = hTextFlowTarget.getHistory();
+        }
         Iterable<TransHistoryItem> historyItems =
                 Iterables.transform(history.values(),
                         new TargetHistoryToTransHistoryItemFunction());