diff --git a/src/templates/exportModel.hbs b/src/templates/exportModel.hbs
index 2b3a082d..7ddb2c3e 100644
--- a/src/templates/exportModel.hbs
+++ b/src/templates/exportModel.hbs
@@ -16,7 +16,11 @@ import type { {{{this}}} } from './{{{this}}}';
 {{else equals export 'all-of'}}
 {{>exportComposition}}
 {{else equals export 'enum'}}
+{{#if @root.useUnionTypes}}
+{{>exportType}}
+{{else}}
 {{>exportEnum}}
+{{/if}}
 {{else}}
 {{>exportType}}
 {{/equals}}
diff --git a/src/templates/index.hbs b/src/templates/index.hbs
index e10436ba..d1250b16 100644
--- a/src/templates/index.hbs
+++ b/src/templates/index.hbs
@@ -8,10 +8,10 @@ export { OpenAPI } from './core/OpenAPI';
 {{#if models}}
 
 {{#each models}}
-{{#if enum}}
-export { {{{name}}} } from './models/{{{name}}}';
-{{else if @root.useUnionTypes}}
+{{#if @root.useUnionTypes}}
 export type { {{{name}}} } from './models/{{{name}}}';
+{{else if enum}}
+export { {{{name}}} } from './models/{{{name}}}';
 {{else if enums}}
 export { {{{name}}} } from './models/{{{name}}}';
 {{else}}