diff --git a/initializr-generator/src/main/resources/templates/starter-build.gradle b/initializr-generator/src/main/resources/templates/starter-build.gradle
index 3625c74c..cec65b0a 100644
--- a/initializr-generator/src/main/resources/templates/starter-build.gradle
+++ b/initializr-generator/src/main/resources/templates/starter-build.gradle
@@ -46,13 +46,15 @@ apply plugin: 'war'
 
 group = '{{groupId}}'
 version = '{{version}}'
-sourceCompatibility = {{javaVersion}}{{#kotlin}}{{#java8OrLater}}
+sourceCompatibility = {{javaVersion}}{{#kotlin}}
 compileKotlin {
-	kotlinOptions.jvmTarget = "1.8"
+	freeCompilerArgs = ["-Xjsr305=strict"]{{#java8OrLater}}
+	kotlinOptions.jvmTarget = "1.8"{{/java8OrLater}}
 }
 compileTestKotlin {
-	kotlinOptions.jvmTarget = "1.8"
-}{{/java8OrLater}}{{/kotlin}}
+	freeCompilerArgs = ["-Xjsr305=strict"]{{#java8OrLater}}
+	kotlinOptions.jvmTarget = "1.8"{{/java8OrLater}}
+}{{/kotlin}}
 
 repositories {
 	mavenCentral()
diff --git a/initializr-generator/src/main/resources/templates/starter-pom.xml b/initializr-generator/src/main/resources/templates/starter-pom.xml
index 057862b3..1bd0fd99 100644
--- a/initializr-generator/src/main/resources/templates/starter-pom.xml
+++ b/initializr-generator/src/main/resources/templates/starter-pom.xml
@@ -177,6 +177,9 @@
 				<version>${kotlin.version}</version>
 				{{/kotlinSupport}}
 				<configuration>
+					<args>
+						<arg>-Xjsr305=strict</arg>
+					</args>
 					<compilerPlugins>
 						<plugin>spring</plugin>
 					</compilerPlugins>
diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-java6-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-java6-build.gradle.gen
index bf8534b3..c943b316 100644
--- a/initializr-generator/src/test/resources/project/gradle/kotlin-java6-build.gradle.gen
+++ b/initializr-generator/src/test/resources/project/gradle/kotlin-java6-build.gradle.gen
@@ -23,6 +23,12 @@ apply plugin: 'io.spring.dependency-management'
 group = 'com.example'
 version = '0.0.1-SNAPSHOT'
 sourceCompatibility = 1.6
+compileKotlin {
+	freeCompilerArgs = ["-Xjsr305=strict"]
+}
+compileTestKotlin {
+	freeCompilerArgs = ["-Xjsr305=strict"]
+}
 
 repositories {
 	mavenCentral()
diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-java7-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-java7-build.gradle.gen
index 9311ed5d..e31d97e2 100644
--- a/initializr-generator/src/test/resources/project/gradle/kotlin-java7-build.gradle.gen
+++ b/initializr-generator/src/test/resources/project/gradle/kotlin-java7-build.gradle.gen
@@ -23,6 +23,12 @@ apply plugin: 'io.spring.dependency-management'
 group = 'com.example'
 version = '0.0.1-SNAPSHOT'
 sourceCompatibility = 1.7
+compileKotlin {
+	freeCompilerArgs = ["-Xjsr305=strict"]
+}
+compileTestKotlin {
+	freeCompilerArgs = ["-Xjsr305=strict"]
+}
 
 repositories {
 	mavenCentral()
diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-java9-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-java9-build.gradle.gen
index 53ded534..0333b188 100644
--- a/initializr-generator/src/test/resources/project/gradle/kotlin-java9-build.gradle.gen
+++ b/initializr-generator/src/test/resources/project/gradle/kotlin-java9-build.gradle.gen
@@ -25,9 +25,11 @@ group = 'com.example'
 version = '0.0.1-SNAPSHOT'
 sourceCompatibility = 9
 compileKotlin {
+	freeCompilerArgs = ["-Xjsr305=strict"]
 	kotlinOptions.jvmTarget = "1.8"
 }
 compileTestKotlin {
+	freeCompilerArgs = ["-Xjsr305=strict"]
 	kotlinOptions.jvmTarget = "1.8"
 }
 
diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-build.gradle.gen
index 41aa453a..a9a579df 100644
--- a/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-build.gradle.gen
+++ b/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-build.gradle.gen
@@ -25,9 +25,11 @@ group = 'com.example'
 version = '0.0.1-SNAPSHOT'
 sourceCompatibility = 1.8
 compileKotlin {
+	freeCompilerArgs = ["-Xjsr305=strict"]
 	kotlinOptions.jvmTarget = "1.8"
 }
 compileTestKotlin {
+	freeCompilerArgs = ["-Xjsr305=strict"]
 	kotlinOptions.jvmTarget = "1.8"
 }
 
diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-legacy-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-legacy-build.gradle.gen
index fc0eab6d..69447bd8 100644
--- a/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-legacy-build.gradle.gen
+++ b/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-legacy-build.gradle.gen
@@ -25,9 +25,11 @@ group = 'com.example'
 version = '0.0.1-SNAPSHOT'
 sourceCompatibility = 1.8
 compileKotlin {
+	freeCompilerArgs = ["-Xjsr305=strict"]
 	kotlinOptions.jvmTarget = "1.8"
 }
 compileTestKotlin {
+	freeCompilerArgs = ["-Xjsr305=strict"]
 	kotlinOptions.jvmTarget = "1.8"
 }
 
diff --git a/initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen b/initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen
index 4cab9780..e90663c8 100644
--- a/initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen
+++ b/initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen
@@ -24,9 +24,11 @@ group = 'com.example'
 version = '0.0.1-SNAPSHOT'
 sourceCompatibility = 1.8
 compileKotlin {
+	freeCompilerArgs = ["-Xjsr305=strict"]
 	kotlinOptions.jvmTarget = "1.8"
 }
 compileTestKotlin {
+	freeCompilerArgs = ["-Xjsr305=strict"]
 	kotlinOptions.jvmTarget = "1.8"
 }
 
diff --git a/initializr-generator/src/test/resources/project/kotlin/standard/pom.xml.gen b/initializr-generator/src/test/resources/project/kotlin/standard/pom.xml.gen
index 766947e2..d0d644cb 100644
--- a/initializr-generator/src/test/resources/project/kotlin/standard/pom.xml.gen
+++ b/initializr-generator/src/test/resources/project/kotlin/standard/pom.xml.gen
@@ -61,6 +61,9 @@
 				<groupId>org.jetbrains.kotlin</groupId>
 				<version>${kotlin.version}</version>
 				<configuration>
+					<args>
+						<arg>-Xjsr305=strict</arg>
+					</args>
 					<compilerPlugins>
 						<plugin>spring</plugin>
 					</compilerPlugins>
diff --git a/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen b/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen
index e9918818..9de16ac1 100644
--- a/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen
+++ b/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen
@@ -25,9 +25,11 @@ group = 'com.example'
 version = '0.0.1-SNAPSHOT'
 sourceCompatibility = 1.8
 compileKotlin {
+	freeCompilerArgs = ["-Xjsr305=strict"]
 	kotlinOptions.jvmTarget = "1.8"
 }
 compileTestKotlin {
+	freeCompilerArgs = ["-Xjsr305=strict"]
 	kotlinOptions.jvmTarget = "1.8"
 }
 
diff --git a/initializr-generator/src/test/resources/project/kotlin/war/pom.xml.gen b/initializr-generator/src/test/resources/project/kotlin/war/pom.xml.gen
index 7a9ae5ef..0ae5aaa2 100644
--- a/initializr-generator/src/test/resources/project/kotlin/war/pom.xml.gen
+++ b/initializr-generator/src/test/resources/project/kotlin/war/pom.xml.gen
@@ -66,6 +66,9 @@
 				<groupId>org.jetbrains.kotlin</groupId>
 				<version>${kotlin.version}</version>
 				<configuration>
+					<args>
+						<arg>-Xjsr305=strict</arg>
+					</args>
 					<compilerPlugins>
 						<plugin>spring</plugin>
 					</compilerPlugins>
diff --git a/initializr-generator/src/test/resources/project/maven/kotlin-java6-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/kotlin-java6-pom.xml.gen
index 14956056..c36f350a 100644
--- a/initializr-generator/src/test/resources/project/maven/kotlin-java6-pom.xml.gen
+++ b/initializr-generator/src/test/resources/project/maven/kotlin-java6-pom.xml.gen
@@ -61,6 +61,9 @@
 				<groupId>org.jetbrains.kotlin</groupId>
 				<version>${kotlin.version}</version>
 				<configuration>
+					<args>
+						<arg>-Xjsr305=strict</arg>
+					</args>
 					<compilerPlugins>
 						<plugin>spring</plugin>
 					</compilerPlugins>
diff --git a/initializr-generator/src/test/resources/project/maven/kotlin-java7-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/kotlin-java7-pom.xml.gen
index ee036958..0ac31789 100644
--- a/initializr-generator/src/test/resources/project/maven/kotlin-java7-pom.xml.gen
+++ b/initializr-generator/src/test/resources/project/maven/kotlin-java7-pom.xml.gen
@@ -61,6 +61,9 @@
 				<groupId>org.jetbrains.kotlin</groupId>
 				<version>${kotlin.version}</version>
 				<configuration>
+					<args>
+						<arg>-Xjsr305=strict</arg>
+					</args>
 					<compilerPlugins>
 						<plugin>spring</plugin>
 					</compilerPlugins>
diff --git a/initializr-generator/src/test/resources/project/maven/kotlin-java9-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/kotlin-java9-pom.xml.gen
index 0fd466b0..144136d2 100644
--- a/initializr-generator/src/test/resources/project/maven/kotlin-java9-pom.xml.gen
+++ b/initializr-generator/src/test/resources/project/maven/kotlin-java9-pom.xml.gen
@@ -58,6 +58,9 @@
 				<artifactId>kotlin-maven-plugin</artifactId>
 				<groupId>org.jetbrains.kotlin</groupId>
 				<configuration>
+					<args>
+						<arg>-Xjsr305=strict</arg>
+					</args>
 					<compilerPlugins>
 						<plugin>spring</plugin>
 					</compilerPlugins>
diff --git a/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-legacy-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-legacy-pom.xml.gen
index f237c8c8..221687e4 100644
--- a/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-legacy-pom.xml.gen
+++ b/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-legacy-pom.xml.gen
@@ -61,6 +61,9 @@
 				<groupId>org.jetbrains.kotlin</groupId>
 				<version>${kotlin.version}</version>
 				<configuration>
+					<args>
+						<arg>-Xjsr305=strict</arg>
+					</args>
 					<compilerPlugins>
 						<plugin>spring</plugin>
 					</compilerPlugins>
diff --git a/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-pom.xml.gen
index 13d6c03b..0af8560a 100644
--- a/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-pom.xml.gen
+++ b/initializr-generator/src/test/resources/project/maven/kotlin-springboot2-pom.xml.gen
@@ -58,6 +58,9 @@
 				<artifactId>kotlin-maven-plugin</artifactId>
 				<groupId>org.jetbrains.kotlin</groupId>
 				<configuration>
+					<args>
+						<arg>-Xjsr305=strict</arg>
+					</args>
 					<compilerPlugins>
 						<plugin>spring</plugin>
 					</compilerPlugins>