diff --git a/enginetest/enginetests.go b/enginetest/enginetests.go
index 9a674f1a14..d6fca96fd9 100644
--- a/enginetest/enginetests.go
+++ b/enginetest/enginetests.go
@@ -4881,7 +4881,6 @@ func TestNoDatabaseSelected(t *testing.T, harness Harness) {
 	AssertErrWithCtx(t, e, harness, ctx, "create table a (b int primary key)", nil, sql.ErrNoDatabaseSelected)
 	AssertErrWithCtx(t, e, harness, ctx, "show tables", nil, sql.ErrNoDatabaseSelected)
 	AssertErrWithCtx(t, e, harness, ctx, "show triggers", nil, sql.ErrNoDatabaseSelected)
-	AssertErrWithCtx(t, e, harness, ctx, "call non_existent_proc()", nil, sql.ErrNoDatabaseSelected)
 
 	_, _, _, err := e.Query(ctx, "ROLLBACK")
 	require.NoError(t, err)
diff --git a/sql/planbuilder/proc.go b/sql/planbuilder/proc.go
index 04625b5ff5..cbd844a543 100644
--- a/sql/planbuilder/proc.go
+++ b/sql/planbuilder/proc.go
@@ -304,9 +304,6 @@ func (b *Builder) buildCall(inScope *scope, c *ast.Call) (outScope *scope) {
 	} else if b.ctx.GetCurrentDatabase() != "" {
 		db = b.currentDb()
 	}
-	if db == nil {
-		b.handleErr(sql.ErrNoDatabaseSelected.New())
-	}
 
 	var proc *plan.Procedure
 	var innerQFlags *sql.QueryFlags