diff --git a/initATLASAufschubkonten/cWorker_NCTS.vb b/initATLASAufschubkonten/cWorker_NCTS.vb
index bfcbee9..b9e7b5c 100644
--- a/initATLASAufschubkonten/cWorker_NCTS.vb
+++ b/initATLASAufschubkonten/cWorker_NCTS.vb
@@ -4676,7 +4676,7 @@ Public Class cWorker_NCTS
 
                             'Dim firmaID = -1
 
-                            Dim dtGesamtsicherheit = SQL.loadDgvBySql("Select * From [tblGesamtsicherheit] as gs left join tblGesamtsicherheitsPositionen as pos on pos.gsp_gsnr = gs.gs_gsnr where [gs_MRNNr] = '" & MRNNR & "'  order by gsp_gspPosId", "AVISO")
+                            Dim dtGesamtsicherheit = SQL.loadDgvBySql("Select * From [tblGesamtsicherheit] as gs left join tblGesamtsicherheitsPositionen as pos on pos.gsp_gsId = gs.gs_gsId where [gs_MRNNr] = '" & MRNNR & "' and [gs_dakoyimport] = 1  order by gsp_gspPosId", "AVISO")
 
                             If dtGesamtsicherheit.Rows.Count > 0 Then
 
diff --git a/initATLASAufschubkonten/cWorker_Verwahrung.vb b/initATLASAufschubkonten/cWorker_Verwahrung.vb
index 079ed3d..80c2a8f 100644
--- a/initATLASAufschubkonten/cWorker_Verwahrung.vb
+++ b/initATLASAufschubkonten/cWorker_Verwahrung.vb
@@ -712,7 +712,7 @@ Anzeige:
 
                             'Dim firmaID = -1
 
-                            Dim dtGesamtsicherheit = SQL.loadDgvBySql("Select * From [tblGesamtsicherheit] as gs left join tblGesamtsicherheitsPositionen as pos on pos.gsp_gsnr = gs.gs_gsnr where [gs_VeralteteWeitereRegistriernummer] = '" & MRNNR & "' or [gs_MRNNr] = '" & regNR & "'  order by gsp_gspPosId", "AVISO")
+                            Dim dtGesamtsicherheit = SQL.loadDgvBySql("Select * From [tblGesamtsicherheit] as gs left join tblGesamtsicherheitsPositionen as pos on pos.gsp_gsId = gs.gs_gsId  where ([gs_VeralteteWeitereRegistriernummer] = '" & MRNNR & "' or [gs_MRNNr] = '" & regNR & "') and [gs_dakoyimport] = 1  order by gsp_gspPosId, gsp_MRNNr", "AVISO")
 
                             If dtGesamtsicherheit.Rows.Count > 0 Then