diff --git a/server/pg.go b/server/pg.go
index 49f697606..d29168ea0 100644
--- a/server/pg.go
+++ b/server/pg.go
@@ -414,6 +414,10 @@ func pgWriteResult(w pg.QueryResultWriter, result interface{}) error {
 		}
 
 		return nil
+
+	case nil:
+		return nil
+
 	default:
 		return errors.Errorf("result type %T not yet supported", result)
 	}
diff --git a/sql/select.go b/sql/select.go
index 8d125a96c..c3b2bf020 100644
--- a/sql/select.go
+++ b/sql/select.go
@@ -127,6 +127,9 @@ func (s *SelectHandler) execMappingResult(ctx context.Context, mr *MappingResult
 				},
 			},
 		}
+	case nil:
+		result = pproto.ConstRowser{}
+
 	default:
 		return nil, fmt.Errorf("unsupported result type %T", res)
 	}