diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/InitializePropertyQuickFixFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/InitializePropertyQuickFixFactory.kt
index 9d337149959..f74390ff65e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/InitializePropertyQuickFixFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/InitializePropertyQuickFixFactory.kt
@@ -58,7 +58,7 @@ object InitializePropertyQuickFixFactory : KotlinIntentionActionsFactory() {
         override fun invoke(project: Project, editor: Editor?, file: KtFile) {
             val element = element ?: return
             val descriptor = element.resolveToDescriptorIfAny() as? PropertyDescriptor ?: return
-            val initializerText = CodeInsightUtils.defaultInitializer(descriptor.type) ?: "null"
+            val initializerText = CodeInsightUtils.defaultInitializer(descriptor.type) ?: "TODO()"
             val initializer = element.setInitializer(KtPsiFactory(project).createExpression(initializerText))!!
             if (editor != null) {
                 PsiDocumentManager.getInstance(project).commitDocument(editor.document)
diff --git a/idea/testData/quickfix/addInitializer/topLevelPropertyVarClass.kt b/idea/testData/quickfix/addInitializer/topLevelPropertyVarClass.kt
new file mode 100644
index 00000000000..14d2ec3b8b7
--- /dev/null
+++ b/idea/testData/quickfix/addInitializer/topLevelPropertyVarClass.kt
@@ -0,0 +1,4 @@
+// "Add initializer" "true"
+// WITH_RUNTIME
+class A
+<caret>var label: A
\ No newline at end of file
diff --git a/idea/testData/quickfix/addInitializer/topLevelPropertyVarClass.kt.after b/idea/testData/quickfix/addInitializer/topLevelPropertyVarClass.kt.after
new file mode 100644
index 00000000000..7aeb99df392
--- /dev/null
+++ b/idea/testData/quickfix/addInitializer/topLevelPropertyVarClass.kt.after
@@ -0,0 +1,4 @@
+// "Add initializer" "true"
+// WITH_RUNTIME
+class A
+var label: A = TODO()
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index 0e66ab2f5a2..da209e72872 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -740,6 +740,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             runTest("idea/testData/quickfix/addInitializer/topLevelProperty.kt");
         }
 
+        @TestMetadata("topLevelPropertyVarClass.kt")
+        public void testTopLevelPropertyVarClass() throws Exception {
+            runTest("idea/testData/quickfix/addInitializer/topLevelPropertyVarClass.kt");
+        }
+
         @TestMetadata("topLevelPropertyVarGetterOnly.kt")
         public void testTopLevelPropertyVarGetterOnly() throws Exception {
             runTest("idea/testData/quickfix/addInitializer/topLevelPropertyVarGetterOnly.kt");