diff --git a/db/upgrade/rdb_modern/views/001-v_getobscode.sql b/db/upgrade/rdb_modern/views/001-v_getobscode.sql
index 883a081e..b1f47aca 100644
--- a/db/upgrade/rdb_modern/views/001-v_getobscode.sql
+++ b/db/upgrade/rdb_modern/views/001-v_getobscode.sql
@@ -52,7 +52,7 @@ WITH InvFormQObservations AS
                  dbo.nrt_investigation_observation tnio with (nolock)
                      INNER JOIN dbo.nrt_investigation inv with (nolock) on tnio.public_health_case_uid = inv.public_health_case_uid and ISNULL(tnio.batch_id, 1) = ISNULL(inv.batch_id, 1)
                      inner join dbo.nrt_observation_coded ovc with (nolock) ON ovc.observation_uid = tnio.branch_id
-                     inner join dbo.nrt_observation o with (nolock) ON o.observation_uid = ovc.observation_uid
+                     inner join dbo.nrt_observation o with (nolock) ON o.observation_uid = ovc.observation_uid and ISNULL(o.batch_id,1) = ISNULL(ovc.batch_id,1)
              WHERE branch_type_cd = 'InvFrmQ'
 
          )
diff --git a/db/upgrade/rdb_modern/views/004-v_getobstxt.sql b/db/upgrade/rdb_modern/views/004-v_getobstxt.sql
index 0669ef38..113af63a 100644
--- a/db/upgrade/rdb_modern/views/004-v_getobstxt.sql
+++ b/db/upgrade/rdb_modern/views/004-v_getobstxt.sql
@@ -12,5 +12,5 @@ FROM
     dbo.nrt_investigation_observation tnio with (nolock)
     INNER JOIN dbo.nrt_investigation inv with (nolock) on tnio.public_health_case_uid = inv.public_health_case_uid and ISNULL(tnio.batch_id, 1) = ISNULL(inv.batch_id, 1)
         LEFT JOIN dbo.nrt_observation o with (nolock) ON o.observation_uid = tnio.branch_id
-        LEFT JOIN dbo.nrt_observation_txt ovt with (nolock) ON ovt.observation_uid = o.observation_uid 
+        LEFT JOIN dbo.nrt_observation_txt ovt with (nolock) ON ovt.observation_uid = o.observation_uid and ISNULL(o.batch_id,1) = ISNULL(ovt.batch_id,1)
 WHERE tnio.branch_type_cd = 'InvFrmQ' AND ovt.ovt_seq = 1;
diff --git a/liquibase-service/src/main/resources/db/rdb_modern/views/001-v_getobscode-001.sql b/liquibase-service/src/main/resources/db/rdb_modern/views/001-v_getobscode-001.sql
index 883a081e..b1f47aca 100644
--- a/liquibase-service/src/main/resources/db/rdb_modern/views/001-v_getobscode-001.sql
+++ b/liquibase-service/src/main/resources/db/rdb_modern/views/001-v_getobscode-001.sql
@@ -52,7 +52,7 @@ WITH InvFormQObservations AS
                  dbo.nrt_investigation_observation tnio with (nolock)
                      INNER JOIN dbo.nrt_investigation inv with (nolock) on tnio.public_health_case_uid = inv.public_health_case_uid and ISNULL(tnio.batch_id, 1) = ISNULL(inv.batch_id, 1)
                      inner join dbo.nrt_observation_coded ovc with (nolock) ON ovc.observation_uid = tnio.branch_id
-                     inner join dbo.nrt_observation o with (nolock) ON o.observation_uid = ovc.observation_uid
+                     inner join dbo.nrt_observation o with (nolock) ON o.observation_uid = ovc.observation_uid and ISNULL(o.batch_id,1) = ISNULL(ovc.batch_id,1)
              WHERE branch_type_cd = 'InvFrmQ'
 
          )
diff --git a/liquibase-service/src/main/resources/db/rdb_modern/views/004-v_getobstxt-001.sql b/liquibase-service/src/main/resources/db/rdb_modern/views/004-v_getobstxt-001.sql
index 0669ef38..113af63a 100644
--- a/liquibase-service/src/main/resources/db/rdb_modern/views/004-v_getobstxt-001.sql
+++ b/liquibase-service/src/main/resources/db/rdb_modern/views/004-v_getobstxt-001.sql
@@ -12,5 +12,5 @@ FROM
     dbo.nrt_investigation_observation tnio with (nolock)
     INNER JOIN dbo.nrt_investigation inv with (nolock) on tnio.public_health_case_uid = inv.public_health_case_uid and ISNULL(tnio.batch_id, 1) = ISNULL(inv.batch_id, 1)
         LEFT JOIN dbo.nrt_observation o with (nolock) ON o.observation_uid = tnio.branch_id
-        LEFT JOIN dbo.nrt_observation_txt ovt with (nolock) ON ovt.observation_uid = o.observation_uid 
+        LEFT JOIN dbo.nrt_observation_txt ovt with (nolock) ON ovt.observation_uid = o.observation_uid and ISNULL(o.batch_id,1) = ISNULL(ovt.batch_id,1)
 WHERE tnio.branch_type_cd = 'InvFrmQ' AND ovt.ovt_seq = 1;