diff --git a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/AlterDatabase.java b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/AlterDatabase.java
index 6b01c4e..d2623b3 100644
--- a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/AlterDatabase.java
+++ b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/AlterDatabase.java
@@ -61,6 +61,8 @@
             AtlasEntity dbEntity = toDbEntity(newDb);
 
             ret.addEntity(dbEntity);
+
+            addLocationEntities(dbEntity, ret);
         } else {
             LOG.error("AlterDatabase.getEntities(): failed to retrieve db");
         }
diff --git a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/CreateDatabase.java b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/CreateDatabase.java
index 8305a44..bf5f562 100644
--- a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/CreateDatabase.java
+++ b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/CreateDatabase.java
@@ -68,6 +68,8 @@
             AtlasEntity dbEntity = toDbEntity(db);
 
             ret.addEntity(dbEntity);
+
+            addLocationEntities(dbEntity, ret);
         } else {
             LOG.error("CreateDatabase.getEntities(): failed to retrieve db");
         }
@@ -98,10 +100,7 @@
                         ret.addEntity(dbDDLEntity);
                     }
 
-                    AtlasEntity dbLocationEntity = createHiveLocationEntity(dbEntity, ret);
-                    if (dbLocationEntity != null) {
-                        ret.addEntity(dbLocationEntity);
-                    }
+                    addLocationEntities(dbEntity, ret);
                 } else {
                     LOG.error("CreateDatabase.getEntities(): failed to retrieve db");
                 }
@@ -112,4 +111,12 @@
 
         return ret;
     }
+
+    public void addLocationEntities(AtlasEntity dbEntity, AtlasEntitiesWithExtInfo ret) {
+        AtlasEntity dbLocationEntity = createHiveLocationEntity(dbEntity, ret);
+
+        if (dbLocationEntity != null) {
+            ret.addEntity(dbLocationEntity);
+        }
+    }
 }
\ No newline at end of file