diff --git a/src/core/value_properties.ts b/src/core/value_properties.ts
index c15e2d9a..ee5f8a03 100644
--- a/src/core/value_properties.ts
+++ b/src/core/value_properties.ts
@@ -198,6 +198,19 @@ export function defaultValueForDefinition(typeDefinition: ValueTypeDefinition):
   return typeDefinition
 }
 
+export function hasCustomDefaultValueForDefinition(typeDefinition: ValueTypeDefinition): boolean {
+  const constant = parseValueTypeConstant(typeDefinition as ValueTypeConstant)
+  if (constant) return false;
+
+  const hasDefault = hasProperty(typeDefinition, "default")
+  if (hasDefault) return true;
+  
+  const hasType = hasProperty(typeDefinition, "type")
+  if (hasType) return false;
+
+  return true;
+}
+
 function valueDescriptorForTokenAndTypeDefinition(payload: ValueTypeDefinitionPayload) {
   const { token, typeDefinition } = payload
 
@@ -211,7 +224,7 @@ function valueDescriptorForTokenAndTypeDefinition(payload: ValueTypeDefinitionPa
       return defaultValueForDefinition(typeDefinition)
     },
     get hasCustomDefaultValue() {
-      return parseValueTypeDefault(typeDefinition) !== undefined
+      return hasCustomDefaultValueForDefinition(typeDefinition)
     },
     reader: readers[type],
     writer: writers[type] || writers.default,
diff --git a/src/tests/controllers/default_value_controller.ts b/src/tests/controllers/default_value_controller.ts
index 603842c5..8ccb8539 100644
--- a/src/tests/controllers/default_value_controller.ts
+++ b/src/tests/controllers/default_value_controller.ts
@@ -7,23 +7,33 @@ export class DefaultValueController extends Controller {
     defaultBooleanTrue: { type: Boolean, default: true },
     defaultBooleanFalse: { type: Boolean, default: false },
     defaultBooleanOverride: true,
+    defaultBooleanWithTypeConstant: Boolean,
+    defaultBooleanWithTypeProperty: { type: Boolean },
 
     defaultString: "",
     defaultStringHello: { type: String, default: "Hello" },
     defaultStringOverride: "Override me",
+    defaultStringWithTypeConstant: String,
+    defaultStringWithTypeProperty: { type: String },
 
     defaultNumber: 0,
     defaultNumberThousand: { type: Number, default: 1000 },
     defaultNumberZero: { type: Number, default: 0 },
     defaultNumberOverride: 9999,
+    defaultNumberWithTypeConstant: Number,
+    defaultNumberWithTypeProperty: { type: Number },
 
     defaultArray: [],
     defaultArrayFilled: { type: Array, default: [1, 2, 3] },
     defaultArrayOverride: [9, 9, 9],
+    defaultArrayWithTypeConstant: Array,
+    defaultArrayWithTypeProperty: { type: Array },
 
     defaultObject: {},
     defaultObjectPerson: { type: Object, default: { name: "David" } },
     defaultObjectOverride: { override: "me" },
+    defaultObjectWithTypeConstant: Object,
+    defaultObjectWithTypeProperty: { type: Object },
   }
 
   valueDescriptorMap!: ValueDescriptorMap
@@ -36,6 +46,10 @@ export class DefaultValueController extends Controller {
   hasDefaultBooleanFalseValue!: boolean
   defaultBooleanOverrideValue!: boolean
   hasDefaultBooleanOverrideValue!: boolean
+  defaultBooleanWithTypeConstantValue!: boolean
+  hasDefaultBooleanWithTypeConstantValue!: boolean
+  defaultBooleanWithTypePropertyValue!: boolean
+  hasDefaultBooleanWithTypePropertyValue!: boolean
 
   defaultStringValue!: string
   hasDefaultStringValue!: boolean
@@ -43,6 +57,10 @@ export class DefaultValueController extends Controller {
   hasDefaultStringHelloValue!: boolean
   defaultStringOverrideValue!: string
   hasDefaultStringOverrideValue!: boolean
+  defaultStringWithTypeConstantValue!: string
+  hasDefaultStringWithTypeConstantValue!: boolean
+  defaultStringWithTypePropertyValue!: string
+  hasDefaultStringWithTypePropertyValue!: boolean
 
   defaultNumberValue!: number
   hasDefaultNumberValue!: boolean
@@ -52,6 +70,10 @@ export class DefaultValueController extends Controller {
   hasDefaultNumberZeroValue!: boolean
   defaultNumberOverrideValue!: number
   hasDefaultNumberOverrideValue!: boolean
+  defaultNumberWithTypeConstantValue!: number
+  hasDefaultNumberWithTypeConstantValue!: boolean
+  defaultNumberWithTypePropertyValue!: number
+  hasDefaultNumberWithTypePropertyValue!: boolean
 
   defaultArrayValue!: any[]
   hasDefaultArrayValue!: boolean
@@ -59,6 +81,10 @@ export class DefaultValueController extends Controller {
   hasDefaultArrayFilledValue!: boolean
   defaultArrayOverrideValue!: { [key: string]: any }
   hasDefaultArrayOverrideValue!: boolean
+  defaultArrayWithTypeConstantValue!: any[]
+  hasDefaultArrayWithTypeConstantValue!: boolean
+  defaultArrayWithTypePropertyValue!: any[]
+  hasDefaultArrayWithTypePropertyValue!: boolean
 
   defaultObjectValue!: object
   hasDefaultObjectValue!: boolean
@@ -66,6 +92,11 @@ export class DefaultValueController extends Controller {
   hasDefaultObjectPersonValue!: boolean
   defaultObjectOverrideValue!: object
   hasDefaultObjectOverrideValue!: boolean
+  defaultObjectWithTypeConstantValue!: object
+  hasDefaultObjectWithTypeConstantValue!: boolean
+  defaultObjectWithTypePropertyValue!: object
+  hasDefaultObjectWithTypePropertyValue!: boolean
+  
   lifecycleCallbacks: string[] = []
 
   initialize() {
diff --git a/src/tests/modules/core/default_value_tests.ts b/src/tests/modules/core/default_value_tests.ts
index 924d85f3..32c4cf94 100644
--- a/src/tests/modules/core/default_value_tests.ts
+++ b/src/tests/modules/core/default_value_tests.ts
@@ -46,6 +46,11 @@ export default class DefaultValueTests extends ControllerTestCase(DefaultValueCo
     this.assert.ok(this.controller.hasDefaultBooleanOverrideValue)
   }
 
+  "test boolean with no default value"() {
+    this.assert.notOk(this.controller.hasDefaultBooleanWithTypeConstantValue)
+    this.assert.notOk(this.controller.hasDefaultBooleanWithTypePropertyValue)
+  }
+
   // Strings
 
   "test custom default string values"() {
@@ -76,6 +81,11 @@ export default class DefaultValueTests extends ControllerTestCase(DefaultValueCo
     this.assert.ok(this.controller.hasDefaultStringOverrideValue)
   }
 
+  "test string with no default value"() {
+    this.assert.notOk(this.controller.hasDefaultStringWithTypeConstantValue)
+    this.assert.notOk(this.controller.hasDefaultStringWithTypePropertyValue)
+  }
+
   // Numbers
 
   "test custom default number values"() {
@@ -110,6 +120,11 @@ export default class DefaultValueTests extends ControllerTestCase(DefaultValueCo
     this.assert.ok(this.controller.hasDefaultNumberOverrideValue)
   }
 
+  "test number with no default value"() {
+    this.assert.notOk(this.controller.hasDefaultNumberWithTypeConstantValue)
+    this.assert.notOk(this.controller.hasDefaultNumberWithTypePropertyValue)
+  }
+
   // Arrays
 
   "test custom default array values"() {
@@ -140,6 +155,11 @@ export default class DefaultValueTests extends ControllerTestCase(DefaultValueCo
     this.assert.ok(this.controller.hasDefaultArrayOverrideValue)
   }
 
+  "test array with no default value"() {
+    this.assert.notOk(this.controller.hasDefaultArrayWithTypeConstantValue)
+    this.assert.notOk(this.controller.hasDefaultArrayWithTypePropertyValue)
+  }
+
   // Objects
 
   "test custom default object values"() {
@@ -170,6 +190,11 @@ export default class DefaultValueTests extends ControllerTestCase(DefaultValueCo
     this.assert.ok(this.controller.hasDefaultObjectOverrideValue)
   }
 
+  "test object with no default value"() {
+    this.assert.notOk(this.controller.hasDefaultObjectWithTypeConstantValue)
+    this.assert.notOk(this.controller.hasDefaultObjectWithTypePropertyValue)
+  }
+
   "test [name]ValueChanged callbacks fire after initialize and before connect"() {
     this.assert.deepEqual(this.controller.lifecycleCallbacks, ["initialize", "defaultBooleanValueChanged", "connect"])
   }