diff --git a/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java b/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
index 1591e30cc0..acb13092de 100644
--- a/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
+++ b/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
@@ -55,7 +55,6 @@ public class HPotEntryData implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private Long id;
-    private HTextFlow textFlow;
     private String context;
     @Deprecated
     // use HTextFlow.comment
@@ -73,12 +72,6 @@ protected void setId(Long id) {
         this.id = id;
     }
 
-    @OneToOne
-    @JoinColumn(name = "tf_id", /* nullable=false, */unique = true)
-    @NaturalId
-    public HTextFlow getTextFlow() {
-        return textFlow;
-    }
 
     public String getContext() {
         return context;
diff --git a/zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml b/zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
new file mode 100644
index 0000000000..4ae3a8552e
--- /dev/null
+++ b/zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog
+  xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd">
+
+  <changeSet id="1" author="sflaniga@redhat.com">
+    <comment>Break circular reference between HTextFlow and HPotEntryData</comment>
+    <dropForeignKeyConstraint baseTableName="HPotEntryData" constraintName="FK17A648CFCCAD9D19"/>
+    <dropColumn tableName="HPotEntryData" columnName="tf_id" />
+  </changeSet>
+
+</databaseChangeLog>
diff --git a/zanata-war/src/main/resources/db/db.changelog.xml b/zanata-war/src/main/resources/db/db.changelog.xml
index a7d8f03d0f..6e4446e25e 100644
--- a/zanata-war/src/main/resources/db/db.changelog.xml
+++ b/zanata-war/src/main/resources/db/db.changelog.xml
@@ -35,6 +35,8 @@
     file="changelogs/db.changelog-3.3.xml" />
   <include relativeToChangelogFile="true"
     file="changelogs/db.changelog-3.4.xml" />
+  <include relativeToChangelogFile="true"
+    file="changelogs/db.changelog-3.6.xml" />
 
   <!-- NB: triggers must be created after all table changes -->
   <!-- If the Liquibase version is being updated, please refer to the
diff --git a/zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
index 983ab9d37f..f8a994cdd8 100644
--- a/zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
+++ b/zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
@@ -533,9 +533,6 @@ private void assertTextFlow(boolean checkPos, HTextFlow existingTextFlow,
             assertThat(newTextFlow.getPotEntryData().getReferences())
                     .isEqualTo(
                             existingTextFlow.getPotEntryData().getReferences());
-
-            assertThat(newTextFlow.getPotEntryData().getTextFlow()).isEqualTo(
-                    newTextFlow);
         }
     }
 
diff --git a/zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml b/zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
index c77d250f33..83fee29883 100644
--- a/zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
+++ b/zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
@@ -86,13 +86,14 @@
     project_iteration_id="3" revision="1" obsolete="0"
     last_modified_by_id="1" poHeader_id="1" />
 
+  <HPotEntryData id="1" context="context" comment_id="1" />
+
   <HTextFlow id="1" document_id="1" resId="tf1" revision="1" pos="0"
     obsolete="0" plural="true" wordCount="11" comment_id="1"
     contentHash="5eb63bbbe01eeed093cb22bb8f5acdc3" content0="hello world"
+    potEntryData_id="1"
     content1="hello world1" />
 
-  <HPotEntryData id="1" context="context" comment_id="1" tf_id="1" />
-
   <HTextFlow id="2" document_id="1" resId="tf2" revision="1" pos="1"
     obsolete="0" plural="false" wordCount="11"
     contentHash="5eb63bbbe01eeed093cb22bb8f5acdc3" content0="hello world2" />