diff --git a/plugins/input/postgis/postgis_datasource.cpp b/plugins/input/postgis/postgis_datasource.cpp
index 7cb528bac..acb9655d3 100644
--- a/plugins/input/postgis/postgis_datasource.cpp
+++ b/plugins/input/postgis/postgis_datasource.cpp
@@ -154,10 +154,6 @@ postgis_datasource::postgis_datasource(parameters const& params)
                 schema_ = geometry_table_.substr(0, idx);
                 geometry_table_ = geometry_table_.substr(idx + 1);
             }
-            else
-            {
-                geometry_table_ = geometry_table_.substr(0);
-            }
 
             // NOTE: geometry_table_ how should ideally be a table name, but
             // there are known edge cases where this will break down and
@@ -234,6 +230,10 @@ postgis_datasource::postgis_datasource(parameters const& params)
                 s << "SELECT ST_SRID(\"" << geometryColumn_ << "\") AS srid FROM ";
                 if (!geometry_table_.empty())
                 {
+                    if (!schema_.empty())
+                    {
+                        s << schema_ << '.';
+                    }
                     s << geometry_table_;
                 }
                 else