diff --git a/src/flextype/core/Console/FlextypeConsoleApplication.php b/src/flextype/core/Console/FlextypeConsoleApplication.php
index 37db9370..4cc61918 100644
--- a/src/flextype/core/Console/FlextypeConsoleApplication.php
+++ b/src/flextype/core/Console/FlextypeConsoleApplication.php
@@ -22,9 +22,7 @@ class FlextypeConsoleApplication extends ConsoleApplication
         // Add Console Commands
         console()->add(new EntriesCreateCommand());
         console()->add(new EntriesDeleteCommand());
-
-        // Run Flextype Console Application
-        emitter()->emit('onFlextypeConsoleBeforeRun');
+        
         parent::run();
     }
 }
\ No newline at end of file
diff --git a/src/flextype/flextype.php b/src/flextype/flextype.php
index accd3407..4c08a8f9 100644
--- a/src/flextype/flextype.php
+++ b/src/flextype/flextype.php
@@ -401,6 +401,7 @@ app()->add(new WhoopsMiddleware([
 
 // Run Flextype Application
 if (php_sapi_name() === 'cli') {
+    emitter()->emit('onFlextypeConsoleBeforeRun');
     console()->run();
 } else {
     emitter()->emit('onFlextypeBeforeRun');