diff --git a/eeschema/annotate.cpp b/eeschema/annotate.cpp
index a31cb65397..99a6c98a05 100644
--- a/eeschema/annotate.cpp
+++ b/eeschema/annotate.cpp
@@ -254,5 +254,9 @@ int SCH_EDIT_FRAME::CheckAnnotate( REPORTER& aReporter, bool aOneSheetOnly )
     else
         g_CurrentSheet->GetComponents( componentsList );
 
+    // Empty schematic does not need annotation
+    if( componentsList.GetCount() == 0 )
+        return 0;
+
     return componentsList.CheckAnnotation( aReporter );
 }