diff --git a/frontend/components/forms/validators/validate_query/index.js b/frontend/components/forms/validators/validate_query/index.js
index 350412f221..ea7eacad9f 100644
--- a/frontend/components/forms/validators/validate_query/index.js
+++ b/frontend/components/forms/validators/validate_query/index.js
@@ -26,7 +26,9 @@ export const validateQuery = (queryText) => {
 
     return validQueryResponse;
   } catch (error) {
-    return invalidQueryResponse(error.message);
+    // FIXME: return invalidQueryResponse(error.message);
+    // when SQL parsing has been fixed.
+    return { valid: true, error: null };
   }
 };
 
diff --git a/frontend/components/forms/validators/validate_query/validate_query.tests.js b/frontend/components/forms/validators/validate_query/validate_query.tests.js
index 85bc292f00..7dea05a837 100644
--- a/frontend/components/forms/validators/validate_query/validate_query.tests.js
+++ b/frontend/components/forms/validators/validate_query/validate_query.tests.js
@@ -11,8 +11,10 @@ describe('validateQuery', () => {
   it('rejects malformed queries', () => {
     const { error, valid } = validateQuery(malformedQuery);
 
-    expect(valid).toEqual(false);
-    expect(error).toEqual('Syntax error found near WITH Clause (Statement)');
+    // FIXME: expect(valid).toEqual(false);
+    expect(valid).toEqual(true);
+    // FIXME: expect(error).toEqual('Syntax error found near WITH Clause (Statement)');
+    expect(error).toEqual(null);
   });
 
   it('rejects blank queries', () => {
@@ -24,12 +26,14 @@ describe('validateQuery', () => {
 
   it('rejects create queries', () => {
     const { error, valid } = validateQuery(createQuery);
+
     expect(valid).toEqual(false);
     expect(error).toEqual('Cannot INSERT or CREATE in osquery queries');
   });
 
   it('rejects insert queries', () => {
     const { error, valid } = validateQuery(insertQuery);
+
     expect(valid).toEqual(false);
     expect(error).toEqual('Cannot INSERT or CREATE in osquery queries');
   });