diff --git a/cg/cg2100.cpp b/cg/cg2100.cpp
index 1e90b1f2d..ece3a97ad 100755
--- a/cg/cg2100.cpp
+++ b/cg/cg2100.cpp
@@ -1674,13 +1674,6 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
     if (val.blank())
       val = TDate(TODAY).string();
     msk.set(F_DATAREG, val);
-    if (msk.id2pos(F_SOLAIVA) >= 0)
-    {
-      val = ini.get("SOLAIVA");
-      msk.set(F_SOLAIVA, val);
-      val = ini.get("CODIVA");
-      msk.set(F_CODIVA, val);
-    }
   }
   else
   {                                    
@@ -1688,6 +1681,16 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
     
     if (iva() != nessuna_iva)
     {     
+			if (msk.id2pos(F_SOLAIVA) >= 0)
+			{
+				const TString16 val = ini.get("SOLAIVA");
+				msk.set(F_SOLAIVA, val);
+			}
+			if (msk.id2pos(F_CODIVA) >= 0)
+			{
+				const TString16 val = ini.get("CODIVA");
+				msk.set(F_CODIVA, val);
+			}
       add_cgs_tot(msk);
     
       TSheet_field& is = ivas();