diff --git a/src/main/java/jadx/codegen/ClassGen.java b/src/main/java/jadx/codegen/ClassGen.java
index 3496d1cc1..a03272b3e 100644
--- a/src/main/java/jadx/codegen/ClassGen.java
+++ b/src/main/java/jadx/codegen/ClassGen.java
@@ -135,9 +135,9 @@ public class ClassGen {
 		}
 	}
 
-	public void makeGenericMap(CodeWriter code, Map<ArgType, List<ArgType>> gmap) {
+	public boolean makeGenericMap(CodeWriter code, Map<ArgType, List<ArgType>> gmap) {
 		if (gmap == null || gmap.isEmpty())
-			return;
+			return false;
 
 		code.add('<');
 		int i = 0;
@@ -161,6 +161,7 @@ public class ClassGen {
 			i++;
 		}
 		code.add('>');
+		return true;
 	}
 
 	public void makeClassBody(CodeWriter clsCode) throws CodegenException {
diff --git a/src/main/java/jadx/codegen/MethodGen.java b/src/main/java/jadx/codegen/MethodGen.java
index d4ea5f0b4..aaacb66d8 100644
--- a/src/main/java/jadx/codegen/MethodGen.java
+++ b/src/main/java/jadx/codegen/MethodGen.java
@@ -78,8 +78,8 @@ public class MethodGen {
 			}
 			code.startLine(ai.makeString());
 
-			classGen.makeGenericMap(code, mth.getGenericMap());
-			code.add(' ');
+			if (classGen.makeGenericMap(code, mth.getGenericMap()))
+				code.add(' ');
 
 			if (mth.getAccessFlags().isConstructor()) {
 				code.add(classGen.getClassNode().getShortName()); // constructor