diff --git a/sql/src/main/java/io/crate/analyze/DropTableAnalyzedStatement.java b/sql/src/main/java/io/crate/analyze/DropTableAnalyzedStatement.java
index 82d4a5f78cef..2fcfd220df4c 100644
--- a/sql/src/main/java/io/crate/analyze/DropTableAnalyzedStatement.java
+++ b/sql/src/main/java/io/crate/analyze/DropTableAnalyzedStatement.java
@@ -55,7 +55,7 @@ public void table(TableIdent tableIdent) {
         TableInfo tableInfo = schemaInfo.getTableInfo(tableIdent.name());
         if (tableInfo == null) {
             throw new TableUnknownException(tableIdent.fqn());
-        } else if (tableInfo.isAlias()) {
+        } else if (tableInfo.isAlias() && !tableInfo.isPartitioned()) {
             throw new UnsupportedOperationException("Table alias not allowed in DROP TABLE statement.");
         }
         this.tableIdent = tableIdent;
diff --git a/sql/src/main/java/io/crate/metadata/doc/DocTableInfoBuilder.java b/sql/src/main/java/io/crate/metadata/doc/DocTableInfoBuilder.java
index e78e6c1a4517..3a023567c489 100644
--- a/sql/src/main/java/io/crate/metadata/doc/DocTableInfoBuilder.java
+++ b/sql/src/main/java/io/crate/metadata/doc/DocTableInfoBuilder.java
@@ -49,11 +49,11 @@
 public class DocTableInfoBuilder {
 
     private final TableIdent ident;
-    private final MetaData metaData;
     private final boolean checkAliasSchema;
     private final DocSchemaInfo docSchemaInfo;
     private final ClusterService clusterService;
     private final TransportPutIndexTemplateAction transportPutIndexTemplateAction;
+    private final MetaData metaData;
     private String[] concreteIndices;
     ESLogger logger = ESLoggerFactory.getLogger(FileSystemUtils.class.getName());
 
@@ -65,8 +65,8 @@ public DocTableInfoBuilder(DocSchemaInfo docSchemaInfo,
         this.docSchemaInfo = docSchemaInfo;
         this.clusterService = clusterService;
         this.transportPutIndexTemplateAction = transportPutIndexTemplateAction;
-        this.metaData = clusterService.state().metaData();
         this.ident = ident;
+        this.metaData = clusterService.state().metaData();
         this.checkAliasSchema = checkAliasSchema;
     }