diff --git a/.gitignore b/.gitignore
index acd6aafe8..86ff386cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 
 /composer.lock
 /vendor
+.idea
diff --git a/scripts/Phalcon/Builder/Model.php b/scripts/Phalcon/Builder/Model.php
index 80c2434b1..1b0159d63 100644
--- a/scripts/Phalcon/Builder/Model.php
+++ b/scripts/Phalcon/Builder/Model.php
@@ -159,7 +159,7 @@ public function build()
             $schema = Utils::resolveDbSchema($config->database);
         }
 
-        if ($schema) {
+        if ($schema && !$this->modelOptions->getOption('noInitSchema')) {
             $initialize['schema'] = $snippet->getThisMethod('setSchema', $schema);
         }
         $initialize['source'] = $snippet->getThisMethod('setSource', $this->modelOptions->getOption('name'));
diff --git a/scripts/Phalcon/Commands/Builtin/Model.php b/scripts/Phalcon/Commands/Builtin/Model.php
index 7d4e2dd80..d242f8fa8 100644
--- a/scripts/Phalcon/Commands/Builtin/Model.php
+++ b/scripts/Phalcon/Commands/Builtin/Model.php
@@ -48,6 +48,7 @@ public function getPossibleParams()
         return [
             'name=s'          => 'Table name',
             'schema=s'        => 'Name of the schema [optional]',
+            'no-init-schema'  => 'Do not add schema into initialize function [optional]',
             'config=s'        => 'Configuration file [optional]',
             'namespace=s'     => "Model's namespace [optional]",
             'get-set'         => 'Attributes will be protected and have setters/getters [optional]',
@@ -84,6 +85,7 @@ public function run(array $parameters)
                 'config'            => $this->getConfigObject(),
                 'className'         => $className,
                 'fileName'          => Text::uncamelize($className),
+                'noInitSchema'      => $this->isReceivedOption('no-init-schema'),
                 'genSettersGetters' => $this->isReceivedOption('get-set'),
                 'genDocMethods'     => $this->isReceivedOption('doc'),
                 'namespace'         => $this->getOption('namespace'),