diff --git a/src/vaadin-text-field-mixin.html b/src/vaadin-text-field-mixin.html
index ae9cc35d..8e2194bb 100644
--- a/src/vaadin-text-field-mixin.html
+++ b/src/vaadin-text-field-mixin.html
@@ -923,6 +923,15 @@
       }
     }
 
+    // Workaround for https://github.com/Polymer/polymer/issues/5259
+    get __data() {
+      return this.__dataValue || {};
+    }
+
+    set __data(value) {
+      this.__dataValue = value;
+    }
+
     /**
      * Fired when the user commits a value change.
      *
diff --git a/test/integer-field.html b/test/integer-field.html
index d4c4d564..c2e9fedb 100644
--- a/test/integer-field.html
+++ b/test/integer-field.html
@@ -19,6 +19,14 @@
     </template>
   </test-fixture>
 
+  <test-fixture id="mixed">
+    <template>
+      <vaadin-integer-field label="integer fld"></vaadin-integer-field>
+      <vaadin-text-field label="text fld"></vaadin-text-field>
+      <vaadin-number-field label="number fld"></vaadin-number-field>
+    </template>
+  </test-fixture>
+
   <script>
     describe('integer-field', () => {
 
@@ -229,6 +237,14 @@
       });
 
     });
+
+    describe('mixed', () => {
+
+      it('should work together with text-field and number-field', () => {
+        expect(() => fixture('mixed')).to.not.throw(Error);
+      });
+
+    });
   </script>
 </body>