diff --git a/jadx-core/src/main/java/jadx/api/impl/AnnotatedCodeWriter.java b/jadx-core/src/main/java/jadx/api/impl/AnnotatedCodeWriter.java
index f4f2d5d07..8999eb5f3 100644
--- a/jadx-core/src/main/java/jadx/api/impl/AnnotatedCodeWriter.java
+++ b/jadx-core/src/main/java/jadx/api/impl/AnnotatedCodeWriter.java
@@ -154,7 +154,6 @@ public class AnnotatedCodeWriter extends SimpleCodeWriter implements ICodeWriter
 
 	@Override
 	public ICodeInfo finish() {
-		removeFirstEmptyLine();
 		processDefinitionAnnotations();
 		validateAnnotations();
 		String code = buf.toString();
diff --git a/jadx-core/src/main/java/jadx/core/codegen/ClassGen.java b/jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
index ae9d097fe..ddf0c93dd 100644
--- a/jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
+++ b/jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
@@ -100,10 +100,12 @@ public class ClassGen {
 		addClassCode(clsBody);
 
 		ICodeWriter clsCode = cls.root().makeCodeWriter();
-		if (!"".equals(cls.getPackage())) {
+		if (cls.getPackage().isEmpty()) {
+			clsCode.add("// default package");
+		} else {
 			clsCode.add("package ").add(cls.getPackage()).add(';');
-			clsCode.newLine();
 		}
+		clsCode.newLine();
 		int importsCount = imports.size();
 		if (importsCount != 0) {
 			List<ClassInfo> sortedImports = new ArrayList<>(imports);