diff --git a/packages/query-splitter/src/splitQuery.ts b/packages/query-splitter/src/splitQuery.ts
index 226013a3b..1adb8b32f 100644
--- a/packages/query-splitter/src/splitQuery.ts
+++ b/packages/query-splitter/src/splitQuery.ts
@@ -2,14 +2,14 @@ import { SplitterOptions, defaultSplitterOptions } from './options';
 
 const SEMICOLON = ';';
 
-interface SplitStreamContext {
+export interface SplitStreamContext {
   options: SplitterOptions;
   currentDelimiter: string;
   pushOutput: (sql: string) => void;
   commandPart: string;
 }
 
-interface SplitLineContext extends SplitStreamContext {
+export interface SplitLineContext extends SplitStreamContext {
   source: string;
   position: number;
   // output: string[];
@@ -246,7 +246,8 @@ export function splitQuery(sql: string, options: SplitterOptions = null): string
 
   splitQueryLine(context);
 
-  pushQuery(context);
-  
+  const trimmed = context.commandPart.trim();
+  if (trimmed) context.pushOutput(trimmed);
+
   return output;
 }