diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a31157..304e017 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+## [3.0.8] - 2021-06-23
+
+### Fixed
+
+- Fixed bug that would cause `WYSIWYGInput` component to send `onChange` events with stale data while initializing its editor state
+
 ## [3.0.7] - 2021-06-21
 
 ### Changes
diff --git a/package-lock.json b/package-lock.json
index d42f5f8..a9f71ac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@perimetre/ui",
-  "version": "3.0.4",
+  "version": "3.0.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0d54f6f..b088687 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@perimetre/ui",
   "description": "A component library made by @perimetre",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/perimetre/ui.git"
diff --git a/src/components/WYSIWYGInput/index.tsx b/src/components/WYSIWYGInput/index.tsx
index bd04dac..8e9b404 100644
--- a/src/components/WYSIWYGInput/index.tsx
+++ b/src/components/WYSIWYGInput/index.tsx
@@ -160,6 +160,7 @@ export const WYSIWYGInput = forwardRef<WYSIWYGInputRef, WYSIWYGInputProps>(
         defaultDecorators
       )
     );
+    const [isEditorStateInitialized, setIsEditorStateInitialized] = useState(false);
     const editor = useRef<Editor | null>(null);
 
     /**
@@ -173,23 +174,23 @@ export const WYSIWYGInput = forwardRef<WYSIWYGInputRef, WYSIWYGInputProps>(
     };
 
     useEffect(() => {
-      // If the onChange prop is provided
-      if (onChangeProps) {
+      // If the onChange prop is provided and we are finished initializing the component state
+      if (onChangeProps && isEditorStateInitialized) {
         // Notify the change
         onChangeProps(editorState);
       }
       // If the editor state changes
-    }, [editorState, onChangeProps]);
+    }, [editorState, onChangeProps, isEditorStateInitialized]);
 
     useEffect(() => {
-      // If the onChange prop is provided
-      if (onHtmlChangeSlow) {
+      // If the onChange prop is provided and we have initialized the component state
+      if (onHtmlChangeSlow && isEditorStateInitialized) {
         // Ref(HTML part at the end): https://jpuri.github.io/react-draft-wysiwyg/#/docs
         const htmlData = draftToHtml(convertToRaw(editorState.getCurrentContent()));
         onHtmlChangeSlow(DOMPurify.sanitize(htmlData));
       }
       // If the editor state changes
-    }, [editorState, onHtmlChangeSlow]);
+    }, [editorState, onHtmlChangeSlow, isEditorStateInitialized]);
 
     useEffect(() => {
       /**
@@ -208,12 +209,18 @@ export const WYSIWYGInput = forwardRef<WYSIWYGInputRef, WYSIWYGInputProps>(
             defaultDecorators
           )
         );
+
+        // make sure to set component as initialized so that it will start sending onChange events
+        setIsEditorStateInitialized(true);
       };
 
       setEditorState(EditorState.set(editorState, { decorator: defaultDecorators }));
 
       if (defaultHtmlValue) {
         updateFromHtml();
+      } else {
+        // make sure to set component as initialized so that it will start sending onChange events
+        setIsEditorStateInitialized(true);
       }
       // Disable because we only want this to update on the first render
       // eslint-disable-next-line react-hooks/exhaustive-deps