diff --git a/eeschema/sch_sheet_path.cpp b/eeschema/sch_sheet_path.cpp
index f7e6c42050..6c9062c47e 100644
--- a/eeschema/sch_sheet_path.cpp
+++ b/eeschema/sch_sheet_path.cpp
@@ -1102,8 +1102,13 @@ void SCH_SHEET_LIST::UpdateSymbolInstanceData(
             // the full path here.
             symbol->AddHierarchicalReference( sheetPath.Path(), it->m_Reference, it->m_Unit );
             symbol->GetField( REFERENCE_FIELD )->SetText( it->m_Reference );
-            symbol->SetValueFieldText( it->m_Value );
-            symbol->SetFootprintFieldText( it->m_Footprint );
+
+            if( !it->m_Value.IsEmpty() )
+                symbol->SetValueFieldText( it->m_Value );
+
+            if( !it->m_Footprint.IsEmpty() )
+                symbol->SetFootprintFieldText( it->m_Footprint );
+
             symbol->UpdatePrefix();
         }
     }