diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca8e56e..dfb2e96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 ChangeLog
 =========
 
+0.4.2 (2016-??-??)
+------------------
+
+* #510: Fix PHP warning on fresh install.
+
+
 0.4.1 (2016-03-17)
 ------------------
 
diff --git a/Core/Frameworks/Flake/Framework.php b/Core/Frameworks/Flake/Framework.php
index 952fcce..adc5c78 100644
--- a/Core/Frameworks/Flake/Framework.php
+++ b/Core/Frameworks/Flake/Framework.php
@@ -230,7 +230,7 @@ class Framework extends \Flake\Core\Framework {
 
     protected static function initDb() {
         # Dont init db on install, but in normal mode and when upgrading
-        if (defined("BAIKAL_CONTEXT_INSTALL") && (BAIKAL_CONFIGURED_VERSION === BAIKAL_VERSION)) {
+        if (defined("BAIKAL_CONTEXT_INSTALL") && (!defined('BAIKAL_CONFIGURED_VERSION') || BAIKAL_CONFIGURED_VERSION === BAIKAL_VERSION)) {
             return true;
         }
         if (defined("PROJECT_DB_MYSQL") && PROJECT_DB_MYSQL === true) {