diff --git a/components/org.wso2.carbon.uiserver/src/main/java/org/wso2/carbon/uiserver/internal/deployment/AppCreator.java b/components/org.wso2.carbon.uiserver/src/main/java/org/wso2/carbon/uiserver/internal/deployment/AppCreator.java
index a4d9cc8..5156822 100644
--- a/components/org.wso2.carbon.uiserver/src/main/java/org/wso2/carbon/uiserver/internal/deployment/AppCreator.java
+++ b/components/org.wso2.carbon.uiserver/src/main/java/org/wso2/carbon/uiserver/internal/deployment/AppCreator.java
@@ -89,10 +89,6 @@ private static SortedSet<Page> createPages(AppReference appReference) {
         List<Page> pages = appReference.getPageReferences().stream()
                 .map(AppCreator::createPage)
                 .collect(Collectors.toList());
-        if (pages.isEmpty()) {
-            throw new AppCreationException("App '" + appReference.getName() + "' does not contains any pages.");
-        }
-
         // TODO: 10/13/17 remove following workaround after adding support for URI patterns with * in UriPatten class
         if ((pages.size() == 1) && (pages.get(0).getUriPatten().matches("/index"))) {
             final Page indexPage = pages.get(0);
diff --git a/components/org.wso2.carbon.uiserver/src/test/java/org/wso2/carbon/uiserver/internal/deployment/AppCreatorTest.java b/components/org.wso2.carbon.uiserver/src/test/java/org/wso2/carbon/uiserver/internal/deployment/AppCreatorTest.java
index afaf568..cdb44b9 100644
--- a/components/org.wso2.carbon.uiserver/src/test/java/org/wso2/carbon/uiserver/internal/deployment/AppCreatorTest.java
+++ b/components/org.wso2.carbon.uiserver/src/test/java/org/wso2/carbon/uiserver/internal/deployment/AppCreatorTest.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import org.wso2.carbon.uiserver.api.App;
-import org.wso2.carbon.uiserver.internal.exception.AppCreationException;
 import org.wso2.carbon.uiserver.internal.io.reference.ArtifactAppReference;
 import org.wso2.carbon.uiserver.internal.reference.AppReference;
 
@@ -39,7 +38,8 @@ public class AppCreatorTest {
     public Object[][] appReferences() {
         return new Object[][]{
                 {new ArtifactAppReference(Paths.get("src/test/resources/apps/full-app/"))},
-                {new ArtifactAppReference(Paths.get("src/test/resources/apps/minimal-app/"))}
+                {new ArtifactAppReference(Paths.get("src/test/resources/apps/minimal-app/"))},
+                {new ArtifactAppReference(Paths.get("src/test/resources/apps/empty-app/"))}
         };
     }
 
@@ -48,11 +48,4 @@ public void testCreateApp(AppReference appReference) {
         App app = AppCreator.createApp(appReference, "/test");
         Assert.assertNotNull(app);
     }
-
-    @Test
-    public void testCreateAppWithEmptyDirectory() {
-        AppReference appReference = new ArtifactAppReference(Paths.get("src/test/resources/apps/empty-app/"));
-        Assert.assertThrows(AppCreationException.class,
-                            () -> AppCreator.createApp(appReference, "/test"));
-    }
 }