diff --git a/src-modules/module/rpta/hilfstabellen/fill_rpta_resultset.sql b/src-modules/module/rpta/hilfstabellen/fill_rpta_resultset.sql
index 6711aef..99c64f1 100644
--- a/src-modules/module/rpta/hilfstabellen/fill_rpta_resultset.sql
+++ b/src-modules/module/rpta/hilfstabellen/fill_rpta_resultset.sql
@@ -50,7 +50,14 @@ R.uniquename as rpta_name
 <#if basetable.is_virtual==0>
 <#foreach rpta_clause in rpta_clauses>
 <#if rpta_clause.rpta_uniquename=basetable.uniquename>
+<#if rpta_clause.joinclause?exists && rpta_clause.joinclause !=''>
 <#assign sqlString = "select current_timestamp as creation_date, " + rpta_clause.fieldclause + " from " + rpta_clause.joinclause + " where 1=1" + rpta_clause.whereclause />
+<#else>
+
+<#assign sqlString = "select current_timestamp as creation_date, " + rpta_clause.fieldclause +  " where 1=1 " + rpta_clause.whereclause />
+
+</#if>
+
 drop table if exists ${basetable.runtime_tablename};