diff --git a/pcbnew/pcb_io/odbpp/odb_eda_data.cpp b/pcbnew/pcb_io/odbpp/odb_eda_data.cpp
index a8eeaf1429..74df60820d 100644
--- a/pcbnew/pcb_io/odbpp/odb_eda_data.cpp
+++ b/pcbnew/pcb_io/odbpp/odb_eda_data.cpp
@@ -212,6 +212,9 @@ void EDA_DATA::AddPackage( const FOOTPRINT* aFp )
     size_t   pkg_index = packages_map.size();
     wxString fp_name = fp->GetFPID().GetLibItemName().wx_str();
     ODB::RemoveWhitespace( fp_name );
+    
+    if( fp_name.IsEmpty() )
+        fp_name = wxS( "__" );
 
     auto [iter, success] = packages_map.emplace( hash, PACKAGE( pkg_index, fp_name ) );