diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83ecc6a..3346f10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.0.18] - 2017-03-20
+### Fixed
+ - Fix conditional check for framework if framework is ''
+
 ## [1.0.17] - 2017-01-20
 ### Fixed
  - Fix issue with layouts namespace.
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
index 8ed35c6..0fac123 100644
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -1,5 +1,5 @@
 <?php
-if (!isset($framework)) {
+if (!isset($framework) || $framework == '') {
     $framework = 'bs4';
 }
 $partial = 'taskforce-support::partials.' . $framework;